From bb6e37f48fd13e16f07f24fb733191fabaddae7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 9 Jan 2026 09:59:38 +0100
Subject: [PATCH] nix: skip failing test on aarch64-darwin

Patch applied to all nixVersions.* as multiple of them
seem to suffer from this issue.

The nixpkgs-unstable channel is on a week old commit now.
This issue doesn't seem worth such a long delay.
---
 pkgs/tools/package-management/nix/default.nix | 48 +++++++++++--------
 .../nix/patches/skip-nix-shell.patch          |  5 ++
 2 files changed, 33 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/tools/package-management/nix/patches/skip-nix-shell.patch

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index a76afd838755..6ddd459776bc 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -127,6 +127,8 @@ let
   ];
   teams = [ lib.teams.nix ];
 
+  # FIXME: https://github.com/NixOS/nixpkgs/issues/476794
+  patches_common = lib.optional (stdenv.system == "aarch64-darwin") ./patches/skip-nix-shell.patch;
 in
 lib.makeExtensible (
   self:
@@ -136,7 +138,7 @@ lib.makeExtensible (
         version = "2.28.5";
         hash = "sha256-oIfAHxO+BCtHXJXLHBnsKkGl1Pw+Uuq1PwNxl+lZ+Oc=";
         self_attribute_name = "nix_2_28";
-        patches = [
+        patches = patches_common ++ [
           (fetchpatch2 {
             name = "nix-2.28-14764-mdbook-0.5-support.patch";
             url = "https://github.com/NixOS/nix/commit/5a64138e862fe364e751c5c286e8db8c466aaee7.patch";
@@ -157,13 +159,16 @@ lib.makeExtensible (
             hash = "sha256-kBuwzMgIE9Tmve0Rpp+q+YCsE2mw9d62M/950ViWeJ0=";
           };
         }).appendPatches
-          [
-            (fetchpatch2 {
-              name = "nix-2.30-14695-mdbook-0.5-support.patch";
-              url = "https://github.com/NixOS/nix/commit/5cbd7856de0a9c13351f98e32a1e26d0854d87fd.patch";
-              hash = "sha256-w8WQfWxMtprDLoZUhrCm4zr6xZXKhoIirq3la0Y7/wU=";
-            })
-          ];
+          (
+            patches_common
+            ++ [
+              (fetchpatch2 {
+                name = "nix-2.30-14695-mdbook-0.5-support.patch";
+                url = "https://github.com/NixOS/nix/commit/5cbd7856de0a9c13351f98e32a1e26d0854d87fd.patch";
+                hash = "sha256-w8WQfWxMtprDLoZUhrCm4zr6xZXKhoIirq3la0Y7/wU=";
+              })
+            ]
+          );
 
       nix_2_30 = addTests "nix_2_30" self.nixComponents_2_30.nix-everything;
 
@@ -180,7 +185,8 @@ lib.makeExtensible (
           };
         }).appendPatches
           (
-            [
+            patches_common
+            ++ [
               (fetchpatch2 {
                 name = "nix-2.31-14692-mdbook-0.5-support.patch";
                 url = "https://github.com/NixOS/nix/commit/a4f5f365090980a6eeb2ef483e49c04bdefd71a8.patch";
@@ -198,17 +204,19 @@ lib.makeExtensible (
 
       nix_2_31 = addTests "nix_2_31" self.nixComponents_2_31.nix-everything;
 
-      nixComponents_2_32 = nixDependencies.callPackage ./modular/packages.nix rec {
-        version = "2.32.5";
-        inherit (self.nix_2_31.meta) maintainers teams;
-        otherSplices = generateSplicesForNixComponents "nixComponents_2_32";
-        src = fetchFromGitHub {
-          owner = "NixOS";
-          repo = "nix";
-          tag = version;
-          hash = "sha256-vnlVgJ5VXn2LVvdzf1HUZeGq0pqa6vII11C8u5Q/YgM=";
-        };
-      };
+      nixComponents_2_32 =
+        (nixDependencies.callPackage ./modular/packages.nix rec {
+          version = "2.32.5";
+          inherit (self.nix_2_31.meta) maintainers teams;
+          otherSplices = generateSplicesForNixComponents "nixComponents_2_32";
+          src = fetchFromGitHub {
+            owner = "NixOS";
+            repo = "nix";
+            tag = version;
+            hash = "sha256-vnlVgJ5VXn2LVvdzf1HUZeGq0pqa6vII11C8u5Q/YgM=";
+          };
+        }).appendPatches
+          patches_common;
 
       nix_2_32 = addTests "nix_2_32" self.nixComponents_2_32.nix-everything;
 
diff --git a/pkgs/tools/package-management/nix/patches/skip-nix-shell.patch b/pkgs/tools/package-management/nix/patches/skip-nix-shell.patch
new file mode 100644
index 000000000000..1a54a291bf35
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/skip-nix-shell.patch
@@ -0,0 +1,5 @@
+--- a/tests/functional/meson.build
++++ b/tests/functional/meson.build
+@@ -90 +90 @@ suites = [
+-      'nix-shell.sh',
++      #'nix-shell.sh',