Commit Graph

143 Commits

Author SHA1 Message Date
Vladimír Čunát
2f7568e092 guile: fixup with multiple-output libtool 2015-10-03 16:34:00 +02:00
Vladimír Čunát
52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Michael Raskin
05c8f5c102 Disable parallel building of Guile for now 2014-11-04 14:24:23 +03:00
宋文武
1e4e719ffb guile: 2.0.9 -> 2.0.11 2014-11-01 16:56:09 +08:00
Eelco Dolstra
cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
Joel Taylor
3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Vladimír Čunát
82797f98f2 Merge branch 'staging' into modular-stdenv
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Eelco Dolstra
e3f7dbbac8 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Jason "Don" O'Conal
438034483a guile: remove gcc_s dep, skip check on darwin 2013-06-20 09:11:04 +10:00
Ludovic Courtès
6aa8c5761c guile: fix non-GNU builds 2013-04-21 12:06:45 +02:00
Ludovic Courtès
7dd6b5f812 guile: update to 2.0.9 2013-04-21 11:44:40 +02:00
Lluis Batlle
1aef67362f guile: adding a patch to allow guile builds without chroots
Otherwise, the NSS troubles may make a test fail.

Patch suggested by ludo.
2013-04-02 18:03:08 +02:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
5e256ccc88 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-04 17:12:35 +01:00
Ludovic Courtès
5b1cbc54b5 guile: update to 2.0.7 2012-11-30 22:34:01 +01:00
Ludovic Courtès
d1279b6a0b guile: Explicitly link against libgcc_s. 2012-09-24 15:40:33 +02:00
Ludovic Courtès
cb76c03216 guile: fix Solaris builds 2012-08-11 21:53:43 +02:00
Ludovic Courtès
986f04c87e guile: disable thread support on Solaris 2012-08-10 23:16:02 +02:00
Ludovic Courtès
9b70bc6e34 guile: allow libunistring and Readline to be found on OpenSolaris 2012-08-10 16:30:28 +02:00
Ludovic Courtès
55cf142175 guile: allow GMP to be found on OpenSolaris 2012-08-09 18:39:30 +02:00
Ludovic Courtès
ac1081fb48 guile: update to 2.0.6 2012-07-08 23:48:00 +02:00
Ludovic Courtès
801c82da55 GNU Guile 2.0: Provide a 2.0ish setup hook.
svn path=/nixpkgs/trunk/; revision=34215
2012-05-22 21:18:20 +00:00
Ludovic Courtès
c1dd4327dc GNU Guile 2.0: Fix cross-GNU builds.
svn path=/nixpkgs/trunk/; revision=34029
2012-05-09 13:42:46 +00:00
Ludovic Courtès
5afbf9075e GNU Guile 1.8: Build without `-Werror'.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32631
2012-02-27 20:10:10 +00:00
Yury G. Kudryashov
5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Ludovic Courtès
452cdc59f1 GNU Guile: Use the right configure option name.
svn path=/nixpkgs/trunk/; revision=32154
2012-02-09 10:07:42 +00:00
Ludovic Courtès
1d44b332ed GNU Guile: Disable pthread support on FreeBSD.
svn path=/nixpkgs/trunk/; revision=32152
2012-02-09 09:16:17 +00:00
Yury G. Kudryashov
215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Ludovic Courtès
38391383f0 GNU Guile 2.0.5.
svn path=/nixpkgs/trunk/; revision=31946
2012-01-31 15:02:38 +00:00
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Ludovic Courtès
c62c173944 GNU Guile: Disable GC-sensitive tests.
The "Unused modules are removed" test happens to fail sometimes on
i686-linux.

svn path=/nixpkgs/trunk/; revision=30416
2011-11-13 22:15:58 +00:00
Ludovic Courtès
e98264fe8f GNU Guile: Fix cross-compilation.
svn path=/nixpkgs/trunk/; revision=30415
2011-11-13 21:28:35 +00:00
Ludovic Courtès
2dcd1544dd GNU Guile 2.0.3!
svn path=/nixpkgs/trunk/; revision=29973
2011-10-22 16:21:07 +00:00
Ludovic Courtès
9188489caf Guile: Disable more GC-sensitive tests when using `-O0'.
svn path=/nixpkgs/trunk/; revision=29854
2011-10-15 16:34:26 +00:00
Ludovic Courtès
a609897ae7 GNU Guile 2.0.2.
svn path=/nixpkgs/trunk/; revision=27582
2011-07-04 11:52:06 +00:00
Ludovic Courtès
457a6eeef6 GNU Guile 2.0.1.
svn path=/nixpkgs/trunk/; revision=27038
2011-04-28 20:57:48 +00:00
Karn Kallio
7c339958f9 Fix missing semicolon
svn path=/nixpkgs/trunk/; revision=25992
2011-02-16 15:11:58 +00:00
Ludovic Courtès
59904446e4 GNU Guile 2.0.0!
svn path=/nixpkgs/trunk/; revision=25990
2011-02-16 13:18:08 +00:00
Ludovic Courtès
726235d36c GNU Guile 1.9.15.
svn path=/nixpkgs/trunk/; revision=25771
2011-02-03 16:42:16 +00:00
Ludovic Courtès
d4872127b5 GNU Guile 1.9: Add patch.
svn path=/nixpkgs/trunk/; revision=25449
2011-01-06 14:38:07 +00:00
Ludovic Courtès
6a4a85d04f GNU Guile 1.8.8.
svn path=/nixpkgs/trunk/; revision=25445
2011-01-06 14:37:52 +00:00
Ludovic Courtès
9dd29fa160 GNU Guile 1.9.14.
svn path=/nixpkgs/trunk/; revision=25421
2011-01-05 10:48:30 +00:00
Lluís Batlle i Rossell
6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Ludovic Courtès
01134e698f GNU Guile 1.9: Add propagated build inputs.
svn path=/nixpkgs/trunk/; revision=24372
2010-10-19 22:23:06 +00:00
Ludovic Courtès
f7278f137e GNU Guile 1.9.13.
svn path=/nixpkgs/trunk/; revision=24364
2010-10-19 13:20:15 +00:00
Lluís Batlle i Rossell
2c5de61327 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
2010-09-17 19:10:21 +00:00
Ludovic Courtès
1ecee338e8 GNU Guile 1.9.12.
svn path=/nixpkgs/trunk/; revision=23649
2010-09-05 15:19:17 +00:00
Ludovic Courtès
f1ea4d1835 GNU Guile 1.8: Fix builds with GCC 4.5.
svn path=/nixpkgs/branches/stdenv-updates/; revision=22369
2010-06-22 08:06:12 +00:00
Ludovic Courtès
298b0ff43c GNU Guile 1.9.11.
svn path=/nixpkgs/trunk/; revision=22215
2010-06-10 21:52:28 +00:00
Ludovic Courtès
8a2edb8797 GNU Guile 1.9.10.
svn path=/nixpkgs/trunk/; revision=21110
2010-04-15 22:53:11 +00:00
Ludovic Courtès
1a1cea3076 GNU Guile 1.9.9.
svn path=/nixpkgs/trunk/; revision=20762
2010-03-19 13:57:17 +00:00
Ludovic Courtès
97c9ff361f GNU Guile 1.9.8.
svn path=/nixpkgs/trunk/; revision=20140
2010-02-20 16:19:36 +00:00
Lluís Batlle i Rossell
bcba809460 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19654
2010-01-25 18:52:07 +00:00
Ludovic Courtès
50a7b78fb4 GNU Guile 1.9.7.
svn path=/nixpkgs/trunk/; revision=19565
2010-01-20 11:09:00 +00:00
Lluís Batlle i Rossell
9183f21f7e Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
Ludovic Courtès
07393ba7f0 GNU Guile 1.9: Reinstate gcov workaround.
Reverts r18418.

svn path=/nixpkgs/trunk/; revision=19254
2010-01-06 08:43:42 +00:00
Lluís Batlle i Rossell
5bae851b1e Merging from trunk. I had to give away some structure to build the native
sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045
2009-12-19 11:14:16 +00:00
Ludovic Courtès
f7c171f73f GNU Guile 1.9.6.
svn path=/nixpkgs/trunk/; revision=19026
2009-12-18 10:49:35 +00:00
Ludovic Courtès
1ca40e6a71 guile: Revert r18907 ("Improve `disable-gc-sensitive-tests.patch'.").
This patch no longer applies to `master' and may be unnecessary now.

svn path=/nixpkgs/trunk/; revision=18936
2009-12-14 15:20:05 +00:00
Lluís Batlle i Rossell
dae3eb2383 Merging from trunk.
I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18912
2009-12-12 18:39:09 +00:00
Ludovic Courtès
b4ae0db5a5 guile: Improve `disable-gc-sensitive-tests.patch'.
svn path=/nixpkgs/trunk/; revision=18907
2009-12-11 21:48:14 +00:00
Lluís Batlle i Rossell
75b60caea0 Updating guile so it uses gawk as a buildNativeInput and not as buildInput.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18561
2009-11-23 17:01:28 +00:00
Lluís Batlle i Rossell
45886e474d On native builds:
- Disabling guile test, because one fails. I commented on that in the source.
On cross builds:
- Adding stripping
- Updating the glibc-2.11 expression to match the parameters of glibc-2.9,
  which I was updating more.
- Renaming from selfNativeBuildInput to selfBuildNativeInput, so this matches
  better the pattern buildNativeInputs.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18550
2009-11-22 22:48:43 +00:00
Ludovic Courtès
98af7b9cb9 GNU Guile 1.8: Clean up.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18545
2009-11-22 22:16:58 +00:00
Lluís Batlle i Rossell
585ba8c27f Big fixes in the cross build:
- Before this changes, cflags and ldflags for the native and the cross compiler
  got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are
  independant now, but enough, I think.
- Fixed the generic stdenv expression, which did a big mess on buildInputs and
  buildNativeInputs. Now it distinguishes when there is a stdenvCross or not.
  Maybe we should have a single stdenv and forget about the stdenvCross
  adapter - this could end in a stdenv a bit complex, but simpler than the
  generic stdenv + adapter.
- Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH
  now works for both the cross and the native compilers, but I think this
  should work well for most cases I can think of.
- I tried to fix the guile expression to cross-biuld; guile is built, but not
  its manual, so the derivation still fails. Guile requires patching to
  cross-build, as far as I understnad.
- Made the glibcCross build to be done through the usage of a
  gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it
  directly.
- Trying to make physfs (a neverball dependency) cross build.
- Updated the gcc expression to support building a cross compiler without getting
  derivation variables mixed with those of the stdenvCross.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
2009-11-22 19:51:45 +00:00
Lluís Batlle i Rossell
a263cb814e Fixed some details on cross compilation. Among others:
- Stating better the guile dependencies (native/host) for guile to build
- Fixing cross-linking, through --rpath-link (ld(1) explains well about it
- Made gcc call the linker and the assembler through the gcc wrapper instead of
  directly. I thought this was the source of missing -rpath's, but the source
  of the problem ended up being the lack of --rpath-link. But I think the
  native gcc calls the wrapped ld and as, so let's do the same cross
  compiling.
- Removed the binutilsCross from the glibc expressions. Now they are built
  using the gcc-cross-wrapper, and they were built with the direct gcc and
  binutils before this change.
- I think patchelf and strip don't break the cross-compiled binaries, so I
  reallow them on cross compilation.
- I disable the checkPhase on cross compilation. This made gmp and libtool
  fail when cross compiled, iirc.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18498
2009-11-21 02:42:52 +00:00
Lluís Batlle i Rossell
a5fee3325a Fixing some things on the gcc-cross-wrapper (libc was not properly added to the
linking path), and with this achieved bash being cross-compilable.
I fixed the few expressions involved in bash building, so they have well stated
native and non-native inputs.

I also tried to cross-build guile, and with this I found a problem in the
actual cross-gcc: it calls the binutils ld, instead of the ld wrapper. This
way, the programs/shared_libraries don't get the proper -rpath.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18497
2009-11-20 22:56:58 +00:00
Ludovic Courtès
1f9e87871e GNU Guile 1.9: Remove unnecessary patch.
svn path=/nixpkgs/trunk/; revision=18418
2009-11-18 13:41:17 +00:00
Ludovic Courtès
e615bc4574 GNU Guile 1.9.5.
svn path=/nixpkgs/trunk/; revision=18415
2009-11-18 13:18:24 +00:00
Ludovic Courtès
f7947871a3 GNU Guile 1.9 with coverage analysis builds.
svn path=/nixpkgs/trunk/; revision=17994
2009-10-28 16:16:23 +00:00
Ludovic Courtès
8e9ea2c209 GNU Guile 1.9.4 (alpha).
svn path=/nixpkgs/trunk/; revision=17843
2009-10-16 08:00:36 +00:00
Ludovic Courtès
50f75f17c5 Guile 1.9: Work around defects in guile-2.0.pc' and guile-config'.
svn path=/nixpkgs/trunk/; revision=17486
2009-09-28 23:23:37 +00:00
Ludovic Courtès
cdd0317b9a Guile 1.9: Propagate `pkg-config'.
svn path=/nixpkgs/trunk/; revision=17359
2009-09-23 09:13:51 +00:00
Ludovic Courtès
717910394b GNU Guile 1.9.3.
svn path=/nixpkgs/trunk/; revision=17188
2009-09-16 12:46:17 +00:00
Ludovic Courtès
8e0c39c285 GNU Guile 1.8.7.
svn path=/nixpkgs/trunk/; revision=16181
2009-07-05 21:41:36 +00:00
Ludovic Courtès
37812e79dd GNU Guile 1.8.6.
svn path=/nixpkgs/trunk/; revision=13599
2008-12-08 22:15:47 +00:00
Michael Raskin
65b252a0df Patched Guile to load srfi .so files correctly from its own directory.
svn path=/nixpkgs/trunk/; revision=12120
2008-06-16 14:27:26 +00:00
Ludovic Courtès
7cc1d84272 GNU Guile 1.8.5.
svn path=/nixpkgs/trunk/; revision=11798
2008-05-09 12:12:26 +00:00
Ludovic Courtès
144e3b4e9d Guile: Use `share/guile/site' as the standard Guile module location.
svn path=/nixpkgs/trunk/; revision=11507
2008-04-09 08:15:30 +00:00
Ludovic Courtès
95f0e6a1a7 Differentiate between longDescription' and description'.
svn path=/nixpkgs/trunk/; revision=11230
2008-03-20 14:35:03 +00:00
Ludovic Courtès
420506d752 Guile: Add various fixes allowing the test suite to run.
svn path=/nixpkgs/trunk/; revision=11196
2008-03-19 08:42:30 +00:00
Ludovic Courtès
9433120f1f Guile: Disable `doCheck' for now.
svn path=/nixpkgs/trunk/; revision=11107
2008-03-13 21:04:07 +00:00
Ludovic Courtès
c1389c4f36 Guile: Run the test suite.
Warning: This makes `nix-worker' hang at the very end of the process,
once "make install" has completed and all installed files have been
scanned for references.

svn path=/nixpkgs/trunk/; revision=11099
2008-03-13 14:18:29 +00:00
Ludovic Courtès
401543289c GNU Guile 1.8.4.
svn path=/nixpkgs/trunk/; revision=10764
2008-02-20 09:02:00 +00:00
Ludovic Courtès
df17eb0dc3 Guile: fix chroot build; make sure guile-snarf' sees gawk'; add a setup hook.
svn path=/nixpkgs/trunk/; revision=10636
2008-02-12 10:41:00 +00:00
Michael Raskin
306ae4b8b4 Bumped Guile version by applying patch by Ludovic Cuort\`es. Added sdparm.
svn path=/nixpkgs/trunk/; revision=9910
2007-12-11 20:48:52 +00:00
Yury G. Kudryashov
bfe435ebaf guile: propagate build inputs
svn path=/nixpkgs/trunk/; revision=9644
2007-11-11 20:23:54 +00:00
Michael Raskin
2d9f1f42b6 Now Guile works
svn path=/nixpkgs/trunk/; revision=9394
2007-10-02 20:48:39 +00:00
Eelco Dolstra
454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=3660
2005-08-22 08:39:27 +00:00
Eelco Dolstra
f6e91bc9c9 * Merge r2396.
svn path=/nixpkgs/trunk/; revision=2397
2005-03-14 09:22:26 +00:00
Martin Bravenboer
f7601af74e Added guile
svn path=/nixpkgs/trunk/; revision=2310
2005-02-25 22:22:40 +00:00