From 368b0d3689c0459e8966293ff69605f00e0a5612 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 19 Feb 2026 14:57:45 +0000
Subject: [PATCH 1/4] tests.config: extend the existing `config`

---
 pkgs/test/config.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/test/config.nix b/pkgs/test/config.nix
index 0f24130efc65..41f4449a808c 100644
--- a/pkgs/test/config.nix
+++ b/pkgs/test/config.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  config,
   pkgs,
   ...
 }:
@@ -17,7 +18,7 @@ lib.recurseIntoAttrs {
     let
       pkgs' = import ../.. {
         system = pkgs.stdenv.hostPlatform.system;
-        config = {
+        config = config // {
           permittedInsecurePackages = builtins.seq pkgs'.glibc.version [ ];
         };
       };

From ad90665682f3ab433ec633390386700b9a1a1337 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 19 Feb 2026 15:04:38 +0000
Subject: [PATCH 2/4] tests.fetchgit: pass `system` and the existing `config`

---
 pkgs/build-support/fetchgit/tests.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchgit/tests.nix b/pkgs/build-support/fetchgit/tests.nix
index 3fab7442ef25..a2f620b4b638 100644
--- a/pkgs/build-support/fetchgit/tests.nix
+++ b/pkgs/build-support/fetchgit/tests.nix
@@ -1,4 +1,6 @@
 {
+  stdenv,
+  config,
   runCommand,
   testers,
   fetchgit,
@@ -239,8 +241,11 @@
   withGitConfig =
     let
       pkgs = import ../../.. {
-        config.gitConfig = {
-          url."https://github.com".insteadOf = "https://doesntexist.forsure";
+        system = stdenv.hostPlatform.system;
+        config = config // {
+          gitConfig = {
+            url."https://github.com".insteadOf = "https://doesntexist.forsure";
+          };
         };
       };
     in

From 36e1dea26b2c9d8913290b5c2e9863067295fbbf Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 19 Feb 2026 15:10:47 +0000
Subject: [PATCH 3/4] tests.stdenv: extend the existing `config`

---
 pkgs/test/stdenv/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
index 6e628997f0f8..27080839c752 100644
--- a/pkgs/test/stdenv/default.nix
+++ b/pkgs/test/stdenv/default.nix
@@ -5,6 +5,7 @@
   stdenv,
   pkgs,
   lib,
+  config,
   testers,
 }:
 
@@ -20,7 +21,7 @@ let
   # use a early stdenv so when hacking on stdenv this test can be run quickly
   bootStdenv = earlyPkgs.stdenv.__bootPackages.stdenv.__bootPackages.stdenv or earlyPkgs.stdenv;
   pkgsStructured = import pkgs.path {
-    config = {
+    config = config // {
       structuredAttrsByDefault = true;
     };
     inherit (stdenv.hostPlatform) system;

From c3ea9587faf43217a5db1ca9bcb4ac8ed5a8e18b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 19 Feb 2026 15:10:47 +0000
Subject: [PATCH 4/4] tests.cross: extend the existing `config`

---
 pkgs/test/cross/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix
index 35a16c146e67..e26f375ac5c9 100644
--- a/pkgs/test/cross/default.nix
+++ b/pkgs/test/cross/default.nix
@@ -1,4 +1,8 @@
-{ pkgs, lib }:
+{
+  pkgs,
+  config,
+  lib,
+}:
 
 let
 
@@ -78,6 +82,7 @@ let
           crossPkgs = import pkgs.path {
             localSystem = { inherit (pkgs.stdenv.hostPlatform) config; };
             crossSystem = crossSystemFun system;
+            inherit config;
           };
 
           emulator = crossPkgs.stdenv.hostPlatform.emulator pkgs;