3
0
Fork 0
forked from mirrors/nixpkgs

Turn nixUnstable back on

This commit is contained in:
Daniel Peebles 2015-01-15 22:47:47 -05:00
parent 1f28bfa284
commit 65522d05d4
2 changed files with 3 additions and 6 deletions

View file

@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "nix-1.8pre3919_f43a8ed";
name = "nix-1.9pre4020_f6716e9";
src = fetchurl {
url = http://hydra.nixos.org/build/17676230/download/4/nix-1.8pre3919_f43a8ed.tar.xz;
sha256 = "6837adca17a1571fb82f7db0f21230577ff5d3d9b2a5ae1e465862033c6fded4";
url = "http://hydra.nixos.org/build/18780017/download/4/${name}.tar.xz";
sha256 = "0jki14yxwv1f33fqkd1bi8bpxafkzjv8yixiwnw8nkhx074sipsn";
};
nativeBuildInputs = [ perl pkgconfig ];

View file

@ -12838,13 +12838,10 @@ let
stateDir = config.nix.stateDir or "/nix/var";
};
/*
nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
storeDir = config.nix.storeDir or "/nix/store";
stateDir = config.nix.stateDir or "/nix/var";
};
*/
nixUnstable = nixStable;
nixops = callPackage ../tools/package-management/nixops { };