public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nix: Update to 1.7

This commit is contained in:
Eelco Dolstra 2014-04-11 11:50:37 +02:00
parent ad65a1e064
commit 2da09363bf
4 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/misc/nix-daemon.nix
View File

@ -253,7 +253,7 @@ in
config = { config = {
nix.chrootDirs = [ "/dev" "/dev/pts" "/proc" "/bin" ]; nix.chrootDirs = [ "/bin" ];
environment.etc."nix/nix.conf".source = nixConf; environment.etc."nix/nix.conf".source = nixConf;

6
pkgs/tools/package-management/nix/default.nix
View File

@ -5,15 +5,13 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nix-1.6.1"; name = "nix-1.7";
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 = "31d15f99b2405924a4be278334cc973a71999303631e6798c1d294db9be4bf84"; sha256 = "349163654f2ae3e1a17fb3da7ed164a4cac153728bbe9a26764e17556d3dcc92";
}; };
patches = [ ./hash-check.patch ];
nativeBuildInputs = [ perl pkgconfig ]; nativeBuildInputs = [ perl pkgconfig ];
buildInputs = [ curl openssl boehmgc sqlite ]; buildInputs = [ curl openssl boehmgc sqlite ];

14
pkgs/tools/package-management/nix/hash-check.patch
View File

@ -1,14 +0,0 @@
commit 11cb4bfb257f18c906ef1d6f14ed450be8fa49fe upstream
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index dcd7343..4329d9a 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -2749,6 +2749,7 @@ void SubstitutionGoal::finished()
logPipe.readSide.close();
/* Get the hash info from stdout. */
+ string dummy = readLine(outPipe.readSide);
string expectedHashStr = statusOk(status) ? readLine(outPipe.readSide) : "";
outPipe.readSide.close();

3
pkgs/top-level/all-packages.nix
View File

@ -10510,10 +10510,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";
}; };
*/
nixops = callPackage ../tools/package-management/nixops { }; nixops = callPackage ../tools/package-management/nixops { };