Commit graph

100 commits

Author SHA1 Message Date
Lluís Batlle i Rossell 46082f25f9 Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=23027
2010-08-07 20:14:04 +00:00
Eelco Dolstra eecae4f36a svn path=/nixpkgs/trunk/; revision=22980 2010-08-05 22:09:41 +00:00
Lluís Batlle i Rossell 5417c720fd Merging from trunk.
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
2010-08-02 15:48:19 +00:00
Peter Simons 815b121dfb pkgs/tools/package-management/nix/unstable.nix: updated to latest version
svn path=/nixpkgs/branches/stdenv-updates/; revision=22613
2010-07-15 14:56:55 +00:00
Peter Simons 9db8a17ce3 pkgs/tools/package-management/nix/unstable.nix: updated to latest version
svn path=/nixpkgs/trunk/; revision=22612
2010-07-15 14:55:19 +00:00
Michael Raskin a07f75cefa Update nixUnstable to latest
svn path=/nixpkgs/trunk/; revision=22578
2010-07-13 14:14:33 +00:00
Eelco Dolstra e4a9bdd834 svn path=/nixpkgs/trunk/; revision=22472 2010-07-05 08:28:15 +00:00
Peter Simons ce9cc7da1f pkgs/tools/package-management/nix/unstable.nix: added support for (impure) NIX_BUILD_CORES variable
svn path=/nixpkgs/branches/stdenv-updates/; revision=22398
2010-06-23 14:34:47 +00:00
Eelco Dolstra b1ffc3abd9 svn path=/nixpkgs/trunk/; revision=22353 2010-06-21 08:38:45 +00:00
Marc Weber f3e7f0fdf0 reverting my patch series adding -j -l support for make
svn path=/nixpkgs/branches/stdenv-updates/; revision=22336
2010-06-19 15:52:28 +00:00
Marc Weber 7db7857d15 nix num-cores.patch
pass MAX_PARALLELIZATION and TARGET_LOAD to the builder. See comments

svn path=/nixpkgs/branches/stdenv-updates/; revision=22284
2010-06-15 19:00:54 +00:00
Sander van der Burg 3e958eea23 Upgraded Nix unstable to version 0.16pre22206
svn path=/nixpkgs/trunk/; revision=22207
2010-06-10 10:48:30 +00:00
Rob Vermaas 8827df79dd updating nixSqlite
svn path=/nixpkgs/trunk/; revision=22116
2010-06-03 08:09:54 +00:00
Eelco Dolstra e316a95859 svn path=/nixpkgs/trunk/; revision=21924 2010-05-20 13:49:54 +00:00
Eelco Dolstra b93b157771 svn path=/nixpkgs/trunk/; revision=21918 2010-05-20 12:23:16 +00:00
Lluís Batlle i Rossell e283f86174 Making nixUnstable ready to cross build.
That requires bzip2 to cross build properly, and this is done only in stdenv-updates.

svn path=/nixpkgs/trunk/; revision=21878
2010-05-19 15:13:46 +00:00
Eelco Dolstra fc0279c07e svn path=/nixpkgs/trunk/; revision=21811 2010-05-16 22:38:00 +00:00
Eelco Dolstra 687376f426 * Updated Nix.
svn path=/nixpkgs/trunk/; revision=21801
2010-05-16 16:48:38 +00:00
Eelco Dolstra 22d901d935 * Updated Nix.
svn path=/nixpkgs/trunk/; revision=21771
2010-05-14 08:57:16 +00:00
Ludovic Courtès 83609f6191 nixUnstable: Fix typo.
svn path=/nixpkgs/trunk/; revision=21617
2010-05-05 19:48:39 +00:00
Ludovic Courtès d2e6d7b84f Update Nix unstable.
svn path=/nixpkgs/trunk/; revision=21601
2010-05-05 09:30:42 +00:00
Eelco Dolstra 7cdad55164 * Use OpenSSL's implementation of MD5, SHA-1 and SHA-256, as they're
a bit faster.

svn path=/nixpkgs/trunk/; revision=21218
2010-04-21 20:07:26 +00:00
Eelco Dolstra 8396168276 * Updated Nix to 0.15.
svn path=/nixpkgs/trunk/; revision=20697
2010-03-17 12:16:03 +00:00
Eelco Dolstra 8ff6ffbb65 * Update the unstable Nix (with some GC-related bug fixes).
svn path=/nixpkgs/trunk/; revision=20652
2010-03-16 12:46:12 +00:00
Eelco Dolstra 2c44e4313c svn path=/nixpkgs/trunk/; revision=20570 2010-03-11 16:22:55 +00:00
Ludovic Courtès 9c2c2af4b2 Latest Nix from `trunk'.
svn path=/nixpkgs/trunk/; revision=20568
2010-03-11 16:10:06 +00:00
Eelco Dolstra 2745223414 * Updated nixSqlite.
svn path=/nixpkgs/trunk/; revision=20552
2010-03-11 11:36:40 +00:00
Ludovic Courtès 62a4d66a48 Fix URL of `nixUnstable'.
svn path=/nixpkgs/trunk/; revision=20551
2010-03-11 11:15:58 +00:00
Ludovic Courtès c22cc79a9e Latest Nix from `trunk'.
svn path=/nixpkgs/trunk/; revision=20549
2010-03-11 10:51:53 +00:00
Eelco Dolstra 854b22a24e * Updated nixSqlite.
svn path=/nixpkgs/trunk/; revision=20520
2010-03-10 09:58:19 +00:00
Lluís Batlle i Rossell 997723ec9b Trying to make nixUnstable cross-build.
It fails because it builds bin2c for the host system, instead of the build system.
I will wait for a fix upstream.

svn path=/nixpkgs/trunk/; revision=20445
2010-03-05 23:22:36 +00:00
Eelco Dolstra 2ae55812ef svn path=/nixpkgs/trunk/; revision=20428 2010-03-05 18:29:56 +00:00
Rob Vermaas cb4a352b3e wrong hash for nix-mysqlite 0.15
svn path=/nixpkgs/trunk/; revision=20411
2010-03-05 13:15:03 +00:00
Rob Vermaas 0723777cc7 update nixSqlite to 0.15pre20408
svn path=/nixpkgs/trunk/; revision=20410
2010-03-05 13:09:33 +00:00
Eelco Dolstra 2880af03c8 * Add a Nix expression for the Nix SQLite branch (temporarily).
svn path=/nixpkgs/trunk/; revision=20377
2010-03-04 14:39:47 +00:00
Rob Vermaas c4332bb7a1 nix 0.15pre20231 as nixUnstable
svn path=/nixpkgs/trunk/; revision=20243
2010-02-25 10:01:33 +00:00
Eelco Dolstra 874b4869a3 * Nix stable updated to 0.14.
svn path=/nixpkgs/trunk/; revision=19830
2010-02-05 10:41:24 +00:00
Eelco Dolstra 031f722394 svn path=/nixpkgs/trunk/; revision=19773 2010-02-03 10:56:10 +00:00
Eelco Dolstra e80d65426f * Nix 0.14pre19730.
svn path=/nixpkgs/trunk/; revision=19733
2010-01-29 15:55:03 +00:00
Eelco Dolstra 10ca771495 * Latest Nix.
svn path=/nixpkgs/trunk/; revision=19653
2010-01-25 17:39:33 +00:00
Eelco Dolstra ed3603d46f svn path=/nixpkgs/trunk/; revision=19034 2009-12-18 13:51:45 +00:00
Eelco Dolstra 06b135ebf8 svn path=/nixpkgs/trunk/; revision=18865 2009-12-09 21:41:19 +00:00
Eelco Dolstra f52952e504 * Nix updated to nix-0.14pre18592.
svn path=/nixpkgs/trunk/; revision=18594
2009-11-24 14:19:20 +00:00
Eelco Dolstra ade60645af * Nix 0.13.
svn path=/nixpkgs/trunk/; revision=18175
2009-11-05 23:47:53 +00:00
Eelco Dolstra 7b8a785497 svn path=/nixpkgs/trunk/; revision=18061 2009-11-01 14:01:05 +00:00
Marc Weber a5fdba90e2 reverting -r17404 - the patch I should have kept private
svn path=/nixpkgs/trunk/; revision=17408
2009-09-24 21:39:32 +00:00
Marc Weber 4d41884f8e nixUnstable: adding experimental debug coercion failure patch - for debugging only
svn path=/nixpkgs/trunk/; revision=17405
2009-09-24 18:22:30 +00:00
Michael Raskin 50c69a093c Building Nix from SVN now needs libxml2
svn path=/nixpkgs/trunk/; revision=17273
2009-09-19 11:40:36 +00:00
Eelco Dolstra 0852ef4da2 svn path=/nixpkgs/trunk/; revision=17233 2009-09-17 17:43:20 +00:00
Marc Weber 4800303718 nixUnstable: allow passing patches
svn path=/nixpkgs/trunk/; revision=17022
2009-09-10 16:57:37 +00:00