nix: Update to 1.5.3

This commit is contained in:
Eelco Dolstra 2013-06-18 00:56:00 +02:00
parent efde9567d1
commit 5bc8275075
2 changed files with 5 additions and 2 deletions

View File

@ -5,11 +5,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nix-1.5.2"; name = "nix-1.5.3";
src = fetchurl { src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
sha256 = "84880fcb94c06b11f66b28837f9c145aa3d65eb0e173fd6da195794a7b0331d1"; sha256 = "070e82a155851900768eb4a638aa50a6df9a8475c6dbc78a3b4a7dea75d64201";
}; };
nativeBuildInputs = [ perl pkgconfig ]; nativeBuildInputs = [ perl pkgconfig ];

View File

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