about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorRobert Hensing <roberth@users.noreply.github.com>2021-01-28 20:11:48 +0100
committerGitHub <noreply@github.com>2021-01-28 19:11:48 +0000
commit1d41739764af5e7d280fb8efc1f5eac4e01ef2a2 (patch)
tree15e13ac41023a9e35a455d6f5240583722f44046 /pkgs
parent3666a66ee0e474c95a4c9c5c10bb4913e21e269f (diff)
downloadnixlib-1d41739764af5e7d280fb8efc1f5eac4e01ef2a2.tar
nixlib-1d41739764af5e7d280fb8efc1f5eac4e01ef2a2.tar.gz
nixlib-1d41739764af5e7d280fb8efc1f5eac4e01ef2a2.tar.bz2
nixlib-1d41739764af5e7d280fb8efc1f5eac4e01ef2a2.tar.lz
nixlib-1d41739764af5e7d280fb8efc1f5eac4e01ef2a2.tar.xz
nixlib-1d41739764af5e7d280fb8efc1f5eac4e01ef2a2.tar.zst
nixlib-1d41739764af5e7d280fb8efc1f5eac4e01ef2a2.zip
nixUnstable: patch #4470 (ETag) (#111005)
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/package-management/nix/default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index c980fda3c861..9ab08007ec71 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -226,6 +226,12 @@ in rec {
         url = "https://github.com/NixOS/nix/commit/d4870462f8f539adeaa6dca476aff6f1f31e1981.patch";
         sha256 = "mTvLvuxb2QVybRDgntKMq+b6da/s3YgM/ll2rWBeY/Y=";
       })
+      # Fix the ETag bug. PR merged. Remove when updating to >= 20210125
+      # https://github.com/NixOS/nixpkgs/pull/109309#issuecomment-768331750
+      (fetchpatch {
+        url = "https://github.com/NixOS/nix/commit/c5b42c5a42138329c6d02da0d8a53cb59c6077f4.patch";
+        sha256 = "sha256-d4RNOKMxa4NMbFgYcqWRv2ByHt8F/XUWV+6P9qHz7S4=";
+      })
     ];
 
     inherit storeDir stateDir confDir boehmgc;