Author: ludo
Date: Fri Sep 17 15:56:15 2010
New Revision: 23832
URL: https://svn.nixos.org/websvn/nix/?rev=23832&sc=1
Log:
Update Nix unstable.
Modified:
nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix Fri Sep
17 15:33:22 2010 (r23831)
+++ nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix Fri Sep
17 15:56:15 2010 (r23832)
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "nix-0.16pre22611";
+ name = "nix-1.0pre23787";
src = fetchurl {
- url = "http://hydra.nixos.org/build/486717/download/4/${name}.tar.bz2";;
- sha256 = "1dazafq1flfyha9j5v31n46wh2bwg0iq59bwwgdk7n2xa8y7dz93";
+ url = "http://hydra.nixos.org/build/632513/download/4/${name}.tar.bz2";;
+ sha256 = "01zn61ak6glyqpjxkzj8a7qw1vrfml1axky1jh1axkw6j35c34d7";
};
buildNativeInputs = [ perl ];
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Sep 17 15:33:22
2010 (r23831)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Sep 17 15:56:15
2010 (r23832)
@@ -6853,13 +6853,11 @@
stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
};
- nixUnstable = nixStable;
- /*
nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
};
- */
+
# The SQLite branch.
nixSqlite = lowPrio (makeOverridable (import
../tools/package-management/nix/sqlite.nix) {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
