From 1d41739764af5e7d280fb8efc1f5eac4e01ef2a2 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 28 Jan 2021 20:11:48 +0100 Subject: [PATCH] nixUnstable: patch #4470 (ETag) (#111005) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jörg Thalheim --- pkgs/tools/package-management/nix/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c980fda3c86..9ab08007ec7 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;