forked from mirrors/nixpkgs
Update Nix unstable.
svn path=/nixpkgs/trunk/; revision=23832
This commit is contained in:
parent
84302a3554
commit
2739c3aa1e
|
@ -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 ];
|
||||
|
|
|
@ -6853,13 +6853,11 @@ let
|
|||
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) {
|
||||
|
|
Loading…
Reference in a new issue