Commit graph

229 commits

Author SHA1 Message Date
Eelco Dolstra
5262980561 nixUnstable: Bump 2013-03-26 16:00:47 +01:00
Eelco Dolstra
93a963f347 nixUnstable: Update to the latest
This is mostly to get rid of those annoying Perl warnings in NixOS...
2013-03-18 22:35:33 +01:00
Vladimír Čunát
26af997d41 Merge branch 'master' into stdenv-updates
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
Eelco Dolstra
1166b82fca nix: Update to 1.5.1 2013-03-01 02:03:09 +01:00
Eelco Dolstra
adef38370c nix: Update to 1.5 2013-02-28 01:20:39 +01:00
Eelco Dolstra
5847037d84 nix: Update to 1.4 2013-02-26 14:41:02 +01:00
Eelco Dolstra
2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Eelco Dolstra
26dd2dc425 nixUnstable: Update to 1.4pre3056_79a3ba7 2013-02-11 15:27:18 +01:00
Lluís Batlle i Rossell
3b26ba7019 Merge remote-tracking branch 'central/master' into stdenv-updates
Conflicts:
	pkgs/os-specific/linux/alsa-utils/default.nix
2013-01-27 11:32:12 +01:00
Eelco Dolstra
abf2ea216a nix: Update to 1.4pre3048_99ed558 2013-01-23 14:16:00 +01:00
Eelco Dolstra
0a47a28f1d Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-22 23:23:53 +01:00
Eelco Dolstra
bcc0c1dc59 Update nixUnstable 2013-01-20 17:26:07 +01:00
Peter Simons
b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Eelco Dolstra
e2d6154fff nix: Update to 1.3
Also, use /etc/nix as the default configuration directory.  This way
$NIX_CONF_DIR no longer needs to be set in most cases.
2013-01-05 18:57:33 +01: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
5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Eelco Dolstra
1c24391251 nix: Update to 1.2 2012-12-07 13:46:07 +01:00
Eelco Dolstra
4b48d05c58 Remove nixCustomFun
Rationale: on the one hand, there are generic customisation facilities
like overrideDerivation; on the other hand, nixCustomFun cannot
possibly accomodate every customisation scenario, so it's easier to
just modify/copy default.nix.
2012-11-29 13:47:40 +01:00
Eelco Dolstra
144b06f107 nix: Update to 1.2pre2980 2012-11-20 12:12:24 +01:00
Eelco Dolstra
ae7044a001 nix: Update to 1.2pre2950_ac238d6 2012-10-16 17:11:54 -04:00
Eelco Dolstra
4606b60dbf nixUnstable: Update to 1.2pre2910_b674665 2012-09-14 12:32:44 -04:00
Eelco Dolstra
c557db2d5c nix: Update to 1.2pre2793_d950cfe
Necessary for systemd.
2012-08-21 08:42:44 -04:00
Eelco Dolstra
006e3fbf46 nix: Update to latest unstable version 2012-08-18 17:54:22 -04:00
Eelco Dolstra
d077a98e77 nix: Update to 1.1 2012-07-18 21:50:41 -04:00
Eelco Dolstra
eeb09aa1bc nix: Update to 1.1pre2749_ccc52ad 2012-07-18 17:03:55 +02:00
Eelco Dolstra
be4a92ad33 nix: Update to 1.1pre2742_a7a43ad 2012-07-16 11:22:28 -04:00
Eelco Dolstra
562259efc1 nix: Update to 1.1pre2723_1aba0bf 2012-07-05 14:05:02 -04:00
Rob Vermaas
484c13cce1 nixUnstable: Updated to 1.1pre2718_8da6772
This version brings better isolation in chroot builds (private network and SysV IPC namespace).
2012-06-25 11:40:17 +02:00
Eelco Dolstra
d5bb10417e nixUnstable: Updated to 1.1pre2714_2f3f413
This version brings systemd support and automatic log compression.
2012-06-22 10:34:08 -04:00
Eelco Dolstra
8a5d68220a * Nix 1.0.
svn path=/nixpkgs/trunk/; revision=34068
2012-05-12 04:20:26 +00:00
Eelco Dolstra
5bdea119d4 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=33971
2012-05-02 13:19:07 +00:00
Eelco Dolstra
be901fa8be * Add an installCheckPhase.
svn path=/nixpkgs/branches/stdenv-updates/; revision=33967
2012-05-01 21:00:30 +00:00
Eelco Dolstra
83f7c6988e * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=33954
2012-04-30 15:33:59 +00:00
Eelco Dolstra
12130aea67 * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=33915
2012-04-25 12:24:16 +00:00
Eelco Dolstra
62765a92a8 * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=33817
2012-04-17 15:56:14 +00:00
Eelco Dolstra
b3980b78f8 * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=33628
2012-04-05 16:38:03 +00:00
Eelco Dolstra
a78b508f8e * Latest nixUnstable.
svn path=/nixpkgs/trunk/; revision=33599
2012-04-04 22:59:16 +00:00
Ludovic Courtès
1a38734345 nixUnstable: Fix cross-compilation native/cross mismatch with bzip2.
See <http://hydra.nixos.org/build/2345751> for the original symptom.

svn path=/nixpkgs/trunk/; revision=33515
2012-04-01 12:08:44 +00:00
Ludovic Courtès
3363c587a4 nixUnstable: Use `postInstall' instead of a custom phase.
svn path=/nixpkgs/trunk/; revision=33514
2012-04-01 12:08:39 +00:00
Yury G. Kudryashov
5299c1f6fb svn merge ^/nixpkgs/trunk
- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
2012-03-31 20:01:40 +00:00
Michael Raskin
a6b434974b Fixing how bzip2 is passed to nixCustom
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33489
2012-03-30 10:18:25 +00:00
Eelco Dolstra
5fd376da83 * Update nixUnstable.
svn path=/nixpkgs/trunk/; revision=33480
2012-03-29 22:10:24 +00:00
Eelco Dolstra
d1cbcc3971 * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=32965
2012-03-09 19:57:33 +00:00
Eelco Dolstra
11d1104a88 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32731
2012-03-01 22:22:24 +00:00
Shea Levy
584ccabaac svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32569
2012-02-25 20:52:15 +00:00
Yury G. Kudryashov
b31c67e24d svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31887
2012-01-27 16:43:39 +00:00
Eelco Dolstra
3ac44bde79 * Disable make check because it fails randomly due to a race.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31790
2012-01-23 12:34:07 +00:00
Eelco Dolstra
b786ce664d * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=31738
2012-01-20 15:26:47 +00:00
Michael Raskin
faedda84ef A more correct condition for adding scripts to install
svn path=/nixpkgs/trunk/; revision=31638
2012-01-18 17:23:41 +00:00
Eelco Dolstra
bbe40d00f4 * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=31619
2012-01-18 12:23:42 +00:00
Eelco Dolstra
cddfcd7bcc * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=31043
2011-12-22 12:30:59 +00:00
Eelco Dolstra
8ed604d4b8 * Bump.
svn path=/nixpkgs/trunk/; revision=30740
2011-12-05 12:12:20 +00:00
Eelco Dolstra
d10ed1b45b * Bump.
svn path=/nixpkgs/trunk/; revision=30630
2011-11-29 22:56:29 +00:00
Eelco Dolstra
6c02d31c68 * Bump.
svn path=/nixpkgs/trunk/; revision=30544
2011-11-23 15:59:09 +00:00
Rob Vermaas
47e2f1c820 update nixUnstable
svn path=/nixpkgs/trunk/; revision=30511
2011-11-21 15:41:19 +00:00
Eelco Dolstra
86e8dcc34b * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=30460
2011-11-17 12:05:52 +00:00
Shea Levy
10cbd00396 Allow cross-compiling configurations to explicitly give a system string when cross-building nix
svn path=/nixpkgs/trunk/; revision=30458
2011-11-16 21:04:02 +00:00
Shea Levy
e895fe5e2f Use gc, dbi, and dbd-sqlite when cross-building nix
The dbi and dbd-sqlite may be hacks since they're not cross-built, I'm not certain

svn path=/nixpkgs/trunk/; revision=30455
2011-11-16 20:21:58 +00:00
Eelco Dolstra
169d5c3214 * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=30319
2011-11-08 14:18:59 +00:00
Eelco Dolstra
041170f5ec * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=30078
2011-10-28 18:06:23 +00:00
Eelco Dolstra
bc1298e651 * Updated nixUnstable.
svn path=/nixpkgs/trunk/; revision=29203
2011-09-12 10:02:03 +00:00
Eelco Dolstra
9c9cea35ad * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=29082
2011-09-07 16:14:42 +00:00
Eelco Dolstra
9049a3000d * Update nixUnstable.
svn path=/nixpkgs/trunk/; revision=28403
2011-08-08 19:55:14 +00:00
Eelco Dolstra
4cc476fa52 * Update nixUnstable.
svn path=/nixpkgs/trunk/; revision=27782
2011-07-14 17:16:00 +00:00
Ludovic Courtès
e7e3bea7bf Update Nix unstable.
svn path=/nixpkgs/trunk/; revision=27596
2011-07-04 14:44:46 +00:00
Michael Raskin
3827d28f27 Update nixCustom for all the dependencies of latest SVN Nix
svn path=/nixpkgs/trunk/; revision=27084
2011-05-02 08:29:01 +00:00
Eelco Dolstra
03ef305478 * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=26851
2011-04-15 13:39:44 +00:00
Eelco Dolstra
0970ed2f9b * Bump.
svn path=/nixpkgs/trunk/; revision=26016
2011-02-17 15:25:54 +00:00
Eelco Dolstra
1062dbd1b0 * Bump.
svn path=/nixpkgs/trunk/; revision=26012
2011-02-17 13:37:48 +00:00
Eelco Dolstra
6ca6fd8fc6 * Use Nix with SQLite in NixOS by default. Cross fingers.
svn path=/nixpkgs/trunk/; revision=25898
2011-02-11 12:45:19 +00:00
Michael Raskin
9a9d97642a Pass SQLite to nix-custom
svn path=/nixpkgs/trunk/; revision=25887
2011-02-10 17:13:48 +00:00
Eelco Dolstra
6c790bbbab * Bump.
svn path=/nixpkgs/trunk/; revision=25228
2010-12-21 16:29:01 +00:00
Eelco Dolstra
229b94b30c svn path=/nixpkgs/trunk/; revision=25165 2010-12-17 08:56:53 +00:00
Eelco Dolstra
f14bafc04b * Bump nixSqlite.
svn path=/nixpkgs/trunk/; revision=25118
2010-12-14 10:56:25 +00:00
Eelco Dolstra
97d4a54698 * nixSqlite: bump. Also, go back to using SQLite 3.7 because 3.6 also
gives random "database image is malformed" errors.

svn path=/nixpkgs/trunk/; revision=25050
2010-12-10 10:22:23 +00:00
Eelco Dolstra
7236f87bed * Bump.
svn path=/nixpkgs/trunk/; revision=25025
2010-12-07 13:16:11 +00:00
Eelco Dolstra
f088bd4791 * nixUnstable updated, now with garbage collector.
svn path=/nixpkgs/trunk/; revision=24943
2010-11-30 18:32:23 +00:00
Eelco Dolstra
165a3df7f5 * Update nixSqlite.
svn path=/nixpkgs/trunk/; revision=24764
2010-11-19 10:39:48 +00:00
Michael Raskin
9a6c3e6fe9 Nix trunk requires pkgconfig
svn path=/nixpkgs/trunk/; revision=24541
2010-10-30 12:01:02 +00:00
Michael Raskin
9af1c42473 Pass BoehmGC to Nix
svn path=/nixpkgs/trunk/; revision=24540
2010-10-30 11:21:06 +00:00
Lluís Batlle i Rossell
71b6bc2be5 Updating nixUnstable. I'll propagate it to stdenv-updates, so it gets the
latest fixes that allow it to build in x86_64 gcc 4.5.1 (related to troubles
with a stack overflow).

svn path=/nixpkgs/trunk/; revision=24204
2010-10-10 14:42:55 +00:00
Ludovic Courtès
2739c3aa1e Update Nix unstable.
svn path=/nixpkgs/trunk/; revision=23832
2010-09-17 15:56:15 +00:00
Eelco Dolstra
1d236b4dcc svn path=/nixpkgs/trunk/; revision=23562 2010-08-31 13:18:12 +00:00
Eelco Dolstra
1417d5f300 * Updated the Sqlite Nix.
svn path=/nixpkgs/trunk/; revision=23475
2010-08-27 08:43:51 +00:00
Eelco Dolstra
f5f32a5b4b * Nix 0.16.
svn path=/nixpkgs/trunk/; revision=23208
2010-08-17 15:21:42 +00:00
Eelco Dolstra
eecae4f36a svn path=/nixpkgs/trunk/; revision=22980 2010-08-05 22:09:41 +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
Eelco Dolstra
b1ffc3abd9 svn path=/nixpkgs/trunk/; revision=22353 2010-06-21 08:38:45 +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