From c784de43b72f2c8b7eb2488da806d4c7880eda75 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 5 Apr 2022 11:57:49 +0300 Subject: [PATCH] [release-21.11] nixVersions.nix_2_7: add patch to fix #163374 --- pkgs/tools/package-management/nix/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c62991642efc..55c5605d72de 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -283,6 +283,17 @@ in rec { sha256 = "sha256-m8tqCS6uHveDon5GSro5yZor9H+sHeh+v/veF1IGw24="; }; + patches = [ + # remove when there's a 2.7.1 release + # https://github.com/NixOS/nix/pull/6297 + # https://github.com/NixOS/nix/issues/6243 + # https://github.com/NixOS/nixpkgs/issues/163374 + (fetchpatch { + url = "https://github.com/NixOS/nix/commit/c9afca59e87afe7d716101e6a75565b4f4b631f7.patch"; + sha256 = "sha256-xz7QnWVCI12lX1+K/Zr9UpB93b10t1HS9y/5n5FYf8Q="; + }) + ]; + boehmgc = boehmgc_nixUnstable; inherit storeDir stateDir confDir;