From 1dfe8631a754472933759402ddabae724c646108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 9 Dec 2025 07:53:29 +0100 Subject: [PATCH] nix: drop the recent patch on darwin, fixing build https://hydra.nixos.org/build/316056678 --- pkgs/tools/package-management/nix/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index feaa0ed0cf15..877ab89b4a8e 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -178,13 +178,14 @@ lib.makeExtensible ( hash = "sha256-NLGXPLjENLeKVOg3OZgHXZ+1x6sPIKq9FHH8pxbCrDI="; }; }).appendPatches - [ - (fetchpatch2 { + ( + # issues on darwin: https://github.com/NixOS/nixpkgs/pull/468208#issuecomment-3626314109 + lib.optional stdenv.isLinux (fetchpatch2 { name = "nix-2.31-14240-sri-error-message.patch"; url = "https://github.com/NixOS/nix/commit/56751b1cd2c4700c71c545f2246adf602c97fdf5.patch"; hash = "sha256-CerSBAI+H2RqPp9jsCP0QIM2rZYx3yBZHVVUAztgc18="; }) - ]; + ); nix_2_31 = addTests "nix_2_31" self.nixComponents_2_31.nix-everything;