swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5799 from copumpkin/reinstate-nix-unstable

Browse source 
Turn nixUnstable back on
This commit is contained in:
Daniel Peebles 2015-01-15 23:18:31 -05:00
parent 1f28bfa284 65522d05d4
commit 06f7226541
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/tools/package-management/nix/unstable.nix
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 ];

3
pkgs/top-level/all-packages.nix
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 { };