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

nix: Backport bug fix to check NAR integrity

Browse Source
This commit is contained in:
Eelco Dolstra 2014-01-08 18:28:40 +01:00
parent d805a2b01d
commit b9dbfe7feb
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "31d15f99b2405924a4be278334cc973a71999303631e6798c1d294db9be4bf84"; sha256 = "31d15f99b2405924a4be278334cc973a71999303631e6798c1d294db9be4bf84";
}; };
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 Normal file
View File

@ -0,0 +1,14 @@
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();