1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 16:11:58 +00:00
Commit graph

95 commits

Author SHA1 Message Date
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Tobias Geerinckx-Rice c0a35241f0 mcelog: 133 -> 134
trigger: Avoid warning from earlier merge
2016-03-22 00:59:15 +01:00
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