diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-08 18:28:40 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-09 13:07:57 +0100 |
| commit | b9dbfe7feba501dfe61ea1670bcdf274e9ca66f0 (patch) | |
| tree | 6e33426e3b535a99018132cb38c9495829f1bbb8 /pkgs/tools | |
| parent | d805a2b01dfc00e3c0598192ca081484ae387b9a (diff) | |
| download | nixlib-b9dbfe7feba501dfe61ea1670bcdf274e9ca66f0.tar nixlib-b9dbfe7feba501dfe61ea1670bcdf274e9ca66f0.tar.gz nixlib-b9dbfe7feba501dfe61ea1670bcdf274e9ca66f0.tar.bz2 nixlib-b9dbfe7feba501dfe61ea1670bcdf274e9ca66f0.tar.lz nixlib-b9dbfe7feba501dfe61ea1670bcdf274e9ca66f0.tar.xz nixlib-b9dbfe7feba501dfe61ea1670bcdf274e9ca66f0.tar.zst nixlib-b9dbfe7feba501dfe61ea1670bcdf274e9ca66f0.zip | |
nix: Backport bug fix to check NAR integrity
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nix/hash-check.patch | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 9b0b8b3f24e8..b02d80078aae 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "31d15f99b2405924a4be278334cc973a71999303631e6798c1d294db9be4bf84"; }; + patches = [ ./hash-check.patch ]; + nativeBuildInputs = [ perl pkgconfig ]; buildInputs = [ curl openssl boehmgc sqlite ]; diff --git a/pkgs/tools/package-management/nix/hash-check.patch b/pkgs/tools/package-management/nix/hash-check.patch new file mode 100644 index 000000000000..421ebb70a4f8 --- /dev/null +++ b/pkgs/tools/package-management/nix/hash-check.patch @@ -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(); + |