Merge remote-tracking branch 'origin/staging-next' into staging

doc/languages-frameworks/cuda.section.md

@@ -115,8 +115,8 @@ All new projects should use the CUDA redistributables available in [`cudaPackage
 
 ### Updating supported compilers and GPUs {#updating-supported-compilers-and-gpus}
 
-1. Update `nvcc-compatibilities.nix` in `pkgs/development/cuda-modules/` to include the newest release of NVCC, as well as any newly supported host compilers.
-2. Update `gpus.nix` in `pkgs/development/cuda-modules/` to include any new GPUs supported by the new release of CUDA.
+1. Update `nvccCompatibilities` in `pkgs/development/cuda-modules/_cuda/data/nvcc.nix` to include the newest release of NVCC, as well as any newly supported host compilers.
+2. Update `cudaCapabilityToInfo` in `pkgs/development/cuda-modules/_cuda/data/cuda.nix` to include any new GPUs supported by the new release of CUDA.
 
 ### Updating the CUDA Toolkit runfile installer {#updating-the-cuda-toolkit}
 

lib/systems/platforms.nix

@@ -583,6 +583,14 @@ rec {
       # https://github.com/llvm/llvm-project/pull/132173
       cmodel = "medium";
     };
+    linux-kernel = {
+      name = "loongarch-multiplatform";
+      target = "vmlinuz.efi";
+      autoModules = true;
+      preferBuiltin = true;
+      baseConfig = "defconfig";
+      DTB = true;
+    };
   };
 
   # This function takes a minimally-valid "platform" and returns an
@@ -611,6 +619,9 @@ rec {
     else if platform.isAarch64 then
       if platform.isDarwin then apple-m1 else aarch64-multiplatform
 
+    else if platform.isLoongArch64 then
+      loongarch64-multiplatform
+
     else if platform.isRiscV then
       riscv-multiplatform
 

maintainers/maintainer-list.nix

@@ -13037,12 +13037,6 @@
     githubId = 843652;
     name = "Kim Burgess";
   };
-  kindrowboat = {
-    email = "hello@kindrobot.ca";
-    github = "kindrowboat";
-    githubId = 777773;
-    name = "Stef Dunlap";
-  };
   kini = {
     email = "keshav.kini@gmail.com";
     github = "kini";
@@ -17609,7 +17603,7 @@
   };
   nicoo = {
     email = "nicoo@debian.org";
-    github = "nbraud";
+    github = "nicoonoclaste";
     githubId = 1155801;
     name = "nicoo";
     keys = [ { fingerprint = "E44E 9EA5 4B8E 256A FB73 49D3 EC9D 3708 72BC 7A8C"; } ];
@@ -22924,6 +22918,11 @@
     matrix = "@c3n21:matrix.org";
     githubId = 37077738;
   };
+  sinjin2300 = {
+    name = "Sinjin";
+    github = "Sinjin2300";
+    githubId = 35543336;
+  };
   sioodmy = {
     name = "Antoni Sokołowski";
     github = "sioodmy";

maintainers/scripts/check-cherry-picks.sh

@@ -1,16 +1,23 @@
 #!/usr/bin/env bash
 # Find alleged cherry-picks
 
-set -e
+set -eo pipefail
 
 if [ $# != "2" ] ; then
   echo "usage: check-cherry-picks.sh base_rev head_rev"
   exit 2
 fi
 
+# Make sure we are inside the nixpkgs repo, even when called from outside
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
 PICKABLE_BRANCHES=${PICKABLE_BRANCHES:-master staging release-??.?? staging-??.??}
 problem=0
 
+commits="$(git rev-list \
+  -E -i --grep="cherry.*[0-9a-f]{40}" --reverse \
+  "$1..$2")"
+
 while read new_commit_sha ; do
   if [ -z "$new_commit_sha" ] ; then
     continue  # skip empty lines
@@ -88,10 +95,6 @@ while read new_commit_sha ; do
   echo "$original_commit_sha not found in any pickable branch"
 
   problem=1
-done <<< "$(
-  git rev-list \
-    -E -i --grep="cherry.*[0-9a-f]{40}" --reverse \
-    "$1..$2"
-)"
+done <<< "$commits"
 
 exit $problem

nixos/doc/manual/release-notes/rl-2511.section.md

@@ -27,3 +27,6 @@
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 - `services.clamsmtp` is unmaintained and was removed from Nixpkgs.
+
+- `amdgpu` kernel driver overdrive mode can now be enabled by setting [hardware.amdgpu.overdrive.enable](#opt-hardware.amdgpu.overdrive.enable) and customized through [hardware.amdgpu.overdrive.ppfeaturemask](#opt-hardware.amdgpu.overdrive.ppfeaturemask).
+  This allows for fine-grained control over the GPU's performance and maybe required by overclocking softwares like Corectrl and Lact. These new options replace old options such as {option}`programs.corectrl.gpuOverclock.enable` and {option}`programs.tuxclocker.enableAMD`.

nixos/modules/hardware/corectrl.nix

@@ -8,13 +8,23 @@ let
   inherit (lib)
     mkEnableOption
     mkIf
-    mkOption
     mkPackageOption
     ;
 
   cfg = config.programs.corectrl;
 in
 {
+  imports = [
+    (lib.mkRenamedOptionModule
+      [ "programs" "corectrl" "gpuOverclock" "enable" ]
+      [ "hardware" "amdgpu" "overdrive" "enable" ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "programs" "corectrl" "gpuOverclock" "ppfeaturemask" ]
+      [ "hardware" "amdgpu" "overdrive" "ppfeaturemask" ]
+    )
+  ];
+
   options.programs.corectrl = {
     enable = mkEnableOption ''
       CoreCtrl, a tool to overclock amd graphics cards and processors.
@@ -24,23 +34,6 @@ in
     package = mkPackageOption pkgs "corectrl" {
       extraDescription = "Useful for overriding the configuration options used for the package.";
     };
-
-    gpuOverclock = {
-      enable = mkEnableOption ''
-        GPU overclocking
-      '';
-      ppfeaturemask = mkOption {
-        type = lib.types.str;
-        default = "0xfffd7fff";
-        example = "0xffffffff";
-        description = ''
-          Sets the `amdgpu.ppfeaturemask` kernel option.
-          In particular, it is used here to set the overdrive bit.
-          Default is `0xfffd7fff` as it is less likely to cause flicker issues.
-          Setting it to `0xffffffff` enables all features.
-        '';
-      };
-    };
   };
 
   config = mkIf cfg.enable {
@@ -61,12 +54,6 @@ in
           }
       });
     '';
-
-    # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/gpu/drm/amd/include/amd_shared.h#n169
-    # The overdrive bit
-    boot.kernelParams = mkIf cfg.gpuOverclock.enable [
-      "amdgpu.ppfeaturemask=${cfg.gpuOverclock.ppfeaturemask}"
-    ];
   };
 
   meta.maintainers = with lib.maintainers; [

nixos/modules/services/desktops/telepathy.nix

@@ -8,7 +8,7 @@
 {
 
   meta = {
-    maintainers = lib.teams.gnome.members;
+    maintainers = [ ];
   };
 
   ###### interface
@@ -37,11 +37,6 @@
     environment.systemPackages = [ pkgs.telepathy-mission-control ];
 
     services.dbus.packages = [ pkgs.telepathy-mission-control ];
-
-    # Enable runtime optional telepathy in gnome-shell
-    services.xserver.desktopManager.gnome.sessionPath = with pkgs; [
-      telepathy-glib
-    ];
   };
 
 }

nixos/modules/services/hardware/amdgpu.nix

@@ -16,20 +16,43 @@ in
       series cards. Note: this removes support for analog video outputs,
       which is only available in the `radeon` driver
     '';
+
     initrd.enable = lib.mkEnableOption ''
       loading `amdgpu` kernelModule in stage 1.
       Can fix lower resolution in boot screen during initramfs phase
     '';
+
+    overdrive = {
+      enable = lib.mkEnableOption ''`amdgpu` overdrive mode for overclocking'';
+
+      ppfeaturemask = lib.mkOption {
+        type = lib.types.str;
+        default = "0xfffd7fff";
+        example = "0xffffffff";
+        description = ''
+          Sets the `amdgpu.ppfeaturemask` kernel option. It can be used to enable the overdrive bit.
+          Default is `0xfffd7fff` as it is less likely to cause flicker issues. Setting it to
+          `0xffffffff` enables all features, but also can be unstable. See
+          [the kernel documentation](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/gpu/drm/amd/include/amd_shared.h#n169)
+          for more information.
+        '';
+      };
+    };
+
     opencl.enable = lib.mkEnableOption ''OpenCL support using ROCM runtime library'';
     # cfg.amdvlk option is defined in ./amdvlk.nix module
   };
 
   config = {
-    boot.kernelParams = lib.optionals cfg.legacySupport.enable [
+    boot.kernelParams =
+      lib.optionals cfg.legacySupport.enable [
         "amdgpu.si_support=1"
         "amdgpu.cik_support=1"
         "radeon.si_support=0"
         "radeon.cik_support=0"
+      ]
+      ++ lib.optionals cfg.overdrive.enable [
+        "amdgpu.ppfeaturemask=${cfg.overdrive.ppfeaturemask}"
       ];
 
     boot.initrd.kernelModules = lib.optionals cfg.initrd.enable [ "amdgpu" ];

nixos/modules/services/mail/postfix.nix

@@ -13,7 +13,7 @@ let
 
   haveAliases = cfg.postmasterAlias != "" || cfg.rootAlias != "" || cfg.extraAliases != "";
   haveCanonical = cfg.canonical != "";
-  haveTransport = cfg.transport != "";
+  haveTransport = cfg.transport != "" || (cfg.enableSlowDomains && cfg.slowDomains != [ ]);
   haveVirtual = cfg.virtual != "";
   haveLocalRecipients = cfg.localRecipients != null;
 
@@ -319,13 +319,20 @@ let
   aliasesFile = pkgs.writeText "postfix-aliases" aliases;
   canonicalFile = pkgs.writeText "postfix-canonical" cfg.canonical;
   virtualFile = pkgs.writeText "postfix-virtual" cfg.virtual;
+  transportFile = pkgs.writeText "postfix-transport" (
+    lib.optionalString (cfg.enableSlowDomains && cfg.slowDomains != [ ]) (
+      lib.concatMapStrings (domain: ''
+        ${domain} slow:
+      '') cfg.slowDomains
+    )
+    + cfg.transport
+  );
   localRecipientMapFile = pkgs.writeText "postfix-local-recipient-map" (
     lib.concatMapStrings (x: x + " ACCEPT\n") cfg.localRecipients
   );
   checkClientAccessFile = pkgs.writeText "postfix-check-client-access" cfg.dnsBlacklistOverrides;
   mainCfFile = pkgs.writeText "postfix-main.cf" mainCf;
   masterCfFile = pkgs.writeText "postfix-master.cf" masterCfContent;
-  transportFile = pkgs.writeText "postfix-transport" cfg.transport;
   headerChecksFile = pkgs.writeText "postfix-header-checks" headerChecks;
 
 in
@@ -550,6 +557,32 @@ in
         '';
       };
 
+      enableSlowDomains = lib.mkEnableOption "slow domains feature for rate limiting specific domains";
+
+      slowDomains = lib.mkOption {
+        type = with lib.types; listOf str;
+        default = [ ];
+        example = [
+          "orange.fr"
+          "gmail.com"
+        ];
+        description = "List of domains to be rate-limited using the slow transport.";
+      };
+
+      slowDomainsConfig = {
+        defaultDestinationRateDelay = lib.mkOption {
+          type = lib.types.str;
+          default = "5s";
+          description = "Default rate delay for destinations.";
+        };
+
+        defaultDestinationConcurrencyLimit = lib.mkOption {
+          type = lib.types.int;
+          default = 3;
+          description = "Concurrency limit for slow destinations.";
+        };
+      };
+
       aliasMapType = lib.mkOption {
         type =
           with lib.types;
@@ -985,7 +1018,10 @@ in
             smtpd_tls_key_file = cfg.sslKey;
 
             smtpd_tls_security_level = lib.mkDefault "may";
-
+          }
+          // lib.optionalAttrs cfg.enableSlowDomains {
+            default_destination_rate_delay = cfg.slowDomainsConfig.defaultDestinationRateDelay;
+            default_destination_concurrency_limit = cfg.slowDomainsConfig.defaultDestinationConcurrencyLimit;
           };
 
         services.postfix.masterConfig =
@@ -1077,6 +1113,14 @@ in
                 lib.concatLists (lib.mapAttrsToList mkKeyVal cfg.submissionOptions);
             };
           }
+          // lib.optionalAttrs cfg.enableSlowDomains {
+            slow = {
+              command = "smtp";
+              type = "unix";
+              private = true;
+              maxproc = 2;
+            };
+          }
           // lib.optionalAttrs cfg.enableSmtp {
             smtp_inet = {
               name = "smtp";
@@ -1128,7 +1172,7 @@ in
       (lib.mkIf haveCanonical {
         services.postfix.mapFiles.canonical = canonicalFile;
       })
-      (lib.mkIf haveTransport {
+      (lib.mkIf (haveTransport || (cfg.enableSlowDomains && cfg.slowDomains != [ ])) {
         services.postfix.mapFiles.transport = transportFile;
       })
       (lib.mkIf haveVirtual {

nixos/modules/services/misc/open-webui.nix

@@ -132,6 +132,21 @@ in
           "@system-service"
           "~@privileged"
         ];
+        SupplementaryGroups = [ "render" ]; # for rocm to access /dev/dri/renderD* devices
+        DeviceAllow = [
+          # CUDA
+          # https://docs.nvidia.com/dgx/pdf/dgx-os-5-user-guide.pdf
+          "char-nvidiactl"
+          "char-nvidia-caps"
+          "char-nvidia-frontend"
+          "char-nvidia-uvm"
+          # ROCm
+          "char-drm"
+          "char-fb"
+          "char-kfd"
+          # WSL (Windows Subsystem for Linux)
+          "/dev/dxg"
+        ];
       };
     };
 

nixos/modules/services/misc/tuxclocker.nix

@@ -8,16 +8,18 @@ let
   cfg = config.programs.tuxclocker;
 in
 {
+  imports = [
+    (lib.mkRenamedOptionModule
+      [ "programs" "tuxclocker" "enableAMD" ]
+      [ "hardware" "amdgpu" "overdrive" "enable" ]
+    )
+  ];
+
   options.programs.tuxclocker = {
     enable = lib.mkEnableOption ''
       TuxClocker, a hardware control and monitoring program
     '';
 
-    enableAMD = lib.mkEnableOption ''
-      AMD GPU controls.
-      Sets the `amdgpu.ppfeaturemask` kernel parameter to 0xfffd7fff to enable all TuxClocker controls
-    '';
-
     enabledNVIDIADevices = lib.mkOption {
       type = lib.types.listOf lib.types.int;
       default = [ ];
@@ -72,9 +74,5 @@ in
           );
         in
         lib.concatStrings (map configSection cfg.enabledNVIDIADevices);
-
-      # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/gpu/drm/amd/include/amd_shared.h#n207
-      # Enable everything modifiable in TuxClocker
-      boot.kernelParams = lib.mkIf cfg.enableAMD [ "amdgpu.ppfeaturemask=0xfffd7fff" ];
     };
 }

nixos/tests/ax25.nix

@@ -1,14 +1,12 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
-  let
 
+let
   baud = 57600;
   tty = "/dev/ttyACM0";
   port = "tnc0";
   socatPort = 1234;
 
   createAX25Node = nodeId: {
-
     boot.kernelPackages = pkgs.linuxPackages_ham;
     boot.kernelModules = [ "ax25" ];
 
@@ -128,4 +126,3 @@ import ./make-test-python.nix (
       node2.succeed("journalctl -o cat -u axlisten.service | grep -A1 \"NOCALL-3 to NOCALL-2 ctl I00\" | grep hello")
     '';
 }
-)

nixos/tests/benchexec.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 let
   user = "alice";
@@ -61,4 +60,3 @@ import ./make-test-python.nix (
     ];
   };
 }
-)

nixos/tests/bitcoind.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 {
   name = "bitcoind";
@@ -54,4 +53,3 @@ import ./make-test-python.nix (
     )
   '';
 }
-)

nixos/tests/bittorrent.nix

@@ -6,7 +6,6 @@
 # which only works if the first client successfully uses the UPnP-IGD
 # protocol to poke a hole in the NAT.
 
-import ./make-test-python.nix (
 { pkgs, ... }:
 
 let
@@ -201,4 +200,3 @@ import ./make-test-python.nix (
       )
     '';
 }
-)

nixos/tests/blockbook-frontend.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 {
   name = "blockbook-frontend";
@@ -30,4 +29,3 @@ import ./make-test-python.nix (
     machine.succeed("curl -sSfL http://localhost:9030 | grep 'Blockbook'")
   '';
 }
-)

nixos/tests/boot-stage1.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 {
   name = "boot-stage1";
@@ -190,4 +189,3 @@ import ./make-test-python.nix (
 
   meta.maintainers = with pkgs.lib.maintainers; [ aszlig ];
 }
-)

nixos/tests/boot-stage2.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 {
   name = "boot-stage2";
@@ -130,4 +129,3 @@ import ./make-test-python.nix (
 
   meta.maintainers = with pkgs.lib.maintainers; [ numinit ];
 }
-)

nixos/tests/borgbackup.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 
 let
@@ -273,4 +272,3 @@ import ./make-test-python.nix (
         client.systemctl("stop borgbackup-job-sleepInhibited")
   '';
 }
-)

nixos/tests/borgmatic.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 {
   name = "borgmatic";
@@ -25,4 +24,3 @@ import ./make-test-python.nix (
     machine.succeed("borgmatic")
   '';
 }
-)

nixos/tests/bpftune.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { lib, pkgs, ... }:
 {
 
@@ -22,4 +21,3 @@ import ./make-test-python.nix (
   '';
 
 }
-)

nixos/tests/breitbandmessung.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { lib, ... }:
 {
   name = "breitbandmessung";
@@ -38,4 +37,3 @@ import ./make-test-python.nix (
     machine.screenshot("breitbandmessung")
   '';
 }
-)

nixos/tests/brscan5.nix

@@ -1,7 +1,6 @@
 # integration tests for brscan5 sane driver
 #
 
-import ./make-test-python.nix (
 { pkgs, ... }:
 {
   name = "brscan5";
@@ -50,4 +49,3 @@ import ./make-test-python.nix (
     assert """device `brother5:net1;dev1' is a Brother a ADS-1200""" in scanimage
   '';
 }
-)

nixos/tests/btrbk-doas.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 
 let
@@ -125,4 +124,3 @@ import ./make-test-python.nix (
         archive.succeed("cat /mnt/*/bar | grep bar")
   '';
 }
-)

nixos/tests/btrbk-no-timer.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { lib, pkgs, ... }:
 {
   name = "btrbk-no-timer";
@@ -38,4 +37,3 @@ import ./make-test-python.nix (
     machine.wait_until_succeeds("cat /mnt/btrbk/local/*/bar | grep foo")
   '';
 }
-)

nixos/tests/btrbk-section-order.nix

@@ -6,7 +6,6 @@
 # order-sensitive config format.
 #
 # Issue: https://github.com/NixOS/nixpkgs/issues/195660
-import ./make-test-python.nix (
 { lib, pkgs, ... }:
 {
   name = "btrbk-section-order";
@@ -58,4 +57,3 @@ import ./make-test-python.nix (
     assert got == expect
   '';
 }
-)

nixos/tests/btrbk.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 
 let
@@ -119,4 +118,3 @@ import ./make-test-python.nix (
         archive.succeed("cat /mnt/*/bar | grep bar")
   '';
 }
-)

nixos/tests/budgie.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "budgie";
@@ -101,4 +100,3 @@ import ./make-test-python.nix (
           machine.screenshot("screen")
     '';
 }
-)

nixos/tests/buildkite-agents.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { lib, pkgs, ... }:
 
 {
@@ -30,4 +29,3 @@ import ./make-test-python.nix (
     machine.wait_for_file("/var/lib/buildkite-agent-two/buildkite-agent.cfg")
   '';
 }
-)

nixos/tests/c2fmzq.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "c2FmZQ";
@@ -84,4 +83,3 @@ import ./make-test-python.nix (
           machine.succeed("systemctl show -p ExecStart --value c2fmzq-server.service | grep -F -- '--licenses=false'");
     '';
 }
-)

nixos/tests/cage.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 
 {
@@ -41,4 +40,3 @@ import ./make-test-python.nix (
           machine.screenshot("screen")
     '';
 }
-)

nixos/tests/cagebreak.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 
 let
@@ -69,4 +68,3 @@ import ./make-test-python.nix (
       #     machine.send_key("ctrl-d")
     '';
 }
-)

nixos/tests/canaille.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 let
   certs = import ./common/acme/server/snakeoil-certs.nix;
@@ -59,4 +58,3 @@ import ./make-test-python.nix (
       server.succeed("sudo -iu canaille -- canaille config check")
     '';
 }
-)

nixos/tests/castopod.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "castopod";
@@ -247,4 +246,3 @@ import ./make-test-python.nix (
           "PYTHONUNBUFFERED=1 systemd-cat -t browser-test browser-test")
   '';
 }
-)

nixos/tests/charliecloud.nix

@@ -1,6 +1,5 @@
 # This test checks charliecloud image construction and run
 
-import ./make-test-python.nix (
 { pkgs, ... }:
 let
 
@@ -46,4 +45,3 @@ import ./make-test-python.nix (
     host.succeed('su - alice -c "ch-run /var/tmp/hello -- echo Running_From_Container_OK"')
   '';
 }
-)

nixos/tests/cinnamon-wayland.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "cinnamon-wayland";
@@ -81,4 +80,3 @@ import ./make-test-python.nix (
           machine.fail("coredumpctl --json=short | grep -E 'cinnamon|nemo'")
     '';
 }
-)

nixos/tests/cinnamon.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "cinnamon";
@@ -101,4 +100,3 @@ import ./make-test-python.nix (
           machine.fail("coredumpctl --json=short | grep -E 'cinnamon|nemo'")
     '';
 }
-)

nixos/tests/cjdns.nix

@@ -18,7 +18,6 @@ let
 
 in
 
-import ./make-test-python.nix (
 { pkgs, ... }:
 {
   name = "cjdns";
@@ -131,4 +130,3 @@ import ./make-test-python.nix (
     bob.succeed("curl --fail -g http://[{}]".format(alice_ip6))
   '';
 }
-)

nixos/tests/clickhouse.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 {
   name = "clickhouse";
@@ -32,4 +31,3 @@ import ./make-test-python.nix (
       )
     '';
 }
-)

nixos/tests/cloudlog.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 {
   name = "cloudlog";
@@ -18,4 +17,3 @@ import ./make-test-python.nix (
     machine.wait_until_succeeds("curl -s -L --fail http://localhost | grep 'Login - Cloudlog'")
   '';
 }
-)

nixos/tests/cockpit.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 
 let
@@ -153,4 +152,3 @@ import ./make-test-python.nix (
     client.succeed('PYTHONUNBUFFERED=1 selenium-script')
   '';
 }
-)

nixos/tests/code-server.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "code-server";
@@ -23,4 +22,3 @@ import ./make-test-python.nix (
 
   meta.maintainers = [ lib.maintainers.drupol ];
 }
-)

nixos/tests/coder.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 {
   name = "coder";
@@ -22,4 +21,3 @@ import ./make-test-python.nix (
     machine.succeed("curl --fail http://localhost:3000")
   '';
 }
-)

nixos/tests/collectd.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 {
   name = "collectd";
@@ -38,4 +37,3 @@ import ./make-test-python.nix (
     machine.wait_until_fails(f"cmp before {file}")
   '';
 }
-)

nixos/tests/commafeed.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { lib, ... }:
 {
   name = "commafeed";
@@ -18,4 +17,3 @@ import ./make-test-python.nix (
 
   meta.maintainers = [ lib.maintainers.raroh73 ];
 }
-)

nixos/tests/connman.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "connman";
@@ -82,4 +81,3 @@ import ./make-test-python.nix (
         client.wait_until_succeeds("iw wlan0 info | grep -q nixos-test")
   '';
 }
-)

nixos/tests/consul-template.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { ... }:
 {
   name = "consul-template";
@@ -40,4 +39,3 @@ import ./make-test-python.nix (
     machine.succeed('grep "example" /example')
   '';
 }
-)

nixos/tests/consul.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 
 let
@@ -264,4 +263,3 @@ import ./make-test-python.nix (
     rolling_restart_test(proper_rolling_procedure=False)
   '';
 }
-)

nixos/tests/containers-bridge.nix

@@ -5,7 +5,6 @@ let
   containerIp6 = "fc00::2/7";
 in
 
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "containers-bridge";
@@ -111,4 +110,3 @@ import ./make-test-python.nix (
     machine.fail("nixos-container destroy webserver")
   '';
 }
-)

nixos/tests/containers-custom-pkgs.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 let
 
@@ -45,4 +44,3 @@ import ./make-test-python.nix (
   # This test only consists of evaluating the test machine
   testScript = "pass";
 }
-)

nixos/tests/containers-ephemeral.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "containers-ephemeral";
@@ -56,4 +55,3 @@ import ./make-test-python.nix (
         machine.fail("ls /run/nixos-containers/webserver")
   '';
 }
-)

nixos/tests/containers-extra_veth.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "containers-extra_veth";
@@ -112,4 +111,3 @@ import ./make-test-python.nix (
         machine.fail("nixos-container destroy webserver")
   '';
 }
-)

nixos/tests/containers-hosts.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "containers-hosts";
@@ -52,4 +51,3 @@ import ./make-test-python.nix (
             machine.succeed(f"ping -n -c 1 {host}")
   '';
 }
-)

nixos/tests/containers-imperative.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "containers-imperative";
@@ -33,7 +32,7 @@ import ./make-test-python.nix (
         let
           emptyContainer = import ../lib/eval-config.nix {
             modules = lib.singleton {
-                nixpkgs = { inherit (config.nixpkgs) localSystem; };
+              nixpkgs.hostPlatform = { inherit (pkgs.stdenv.hostPlatform) system; };
 
               containers.foo.config = { };
             };
@@ -194,4 +193,3 @@ import ./make-test-python.nix (
           machine.succeed("test ! -e /var/lib/nixos-containers/b0rk")
     '';
 }
-)

nixos/tests/containers-ip.nix

@@ -12,7 +12,6 @@ let
   };
 
 in
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "containers-ipv4-ipv6";
@@ -79,4 +78,3 @@ import ./make-test-python.nix (
           machine.fail(f"nixos-container destroy {container}")
     '';
 }
-)

nixos/tests/containers-macvlans.nix

@@ -4,7 +4,6 @@ let
   containerIp2 = "192.168.1.254";
 in
 
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "containers-macvlans";
@@ -97,4 +96,3 @@ import ./make-test-python.nix (
         machine2.succeed("ping -n -c 1 ${containerIp2}")
   '';
 }
-)

nixos/tests/containers-names.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "containers-names";
@@ -41,4 +40,3 @@ import ./make-test-python.nix (
     machine.succeed("ip link show | grep ve-really-l3QgY")
   '';
 }
-)

nixos/tests/containers-nested.nix

@@ -1,6 +1,5 @@
 # Test for NixOS' container nesting.
 
-import ./make-test-python.nix (
 { pkgs, ... }:
 {
   name = "nested";
@@ -33,4 +32,3 @@ import ./make-test-python.nix (
     )
   '';
 }
-)

nixos/tests/containers-physical_interfaces.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "containers-physical_interfaces";
@@ -150,4 +149,3 @@ import ./make-test-python.nix (
         )
   '';
 }
-)

nixos/tests/containers-portforward.nix

@@ -5,7 +5,6 @@ let
   containerPort = 80;
 in
 
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "containers-portforward";
@@ -70,4 +69,3 @@ import ./make-test-python.nix (
   '';
 
 }
-)

nixos/tests/containers-reloadable.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "containers-reloadable";
@@ -58,4 +57,3 @@ import ./make-test-python.nix (
   '';
 
 }
-)

nixos/tests/containers-require-bind-mounts.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { lib, ... }:
 {
   name = "containers-require-bind-mounts";
@@ -37,4 +36,3 @@ import ./make-test-python.nix (
       assert "inactive" in machine.fail("systemctl is-active srv-data.mount")
   '';
 }
-)

nixos/tests/containers-restart_networking.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "containers-restart_networking";
@@ -128,4 +127,3 @@ import ./make-test-python.nix (
   '';
 
 }
-)

nixos/tests/containers-tmpfs.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "containers-tmpfs";
@@ -90,4 +89,3 @@ import ./make-test-python.nix (
         machine.fail(tmpfs_cmd("ls -l /var | grep -q test.file"))
   '';
 }
-)

nixos/tests/containers-unified-hierarchy.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "containers-unified-hierarchy";
@@ -23,4 +22,3 @@ import ./make-test-python.nix (
     machine.succeed("echo 'stat -fc %T /sys/fs/cgroup/ | grep cgroup2fs' | nixos-container root-login test-container")
   '';
 }
-)

nixos/tests/convos.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { lib, pkgs, ... }:
 
 let
@@ -25,4 +24,3 @@ import ./make-test-python.nix (
     machine.succeed("curl -f http://localhost:${toString port}/")
   '';
 }
-)

nixos/tests/coturn.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 {
   name = "coturn";
@@ -35,4 +34,3 @@ import ./make-test-python.nix (
     default.log(default.execute("systemd-analyze security coturn.service | grep -v '✓'")[1])
   '';
 }
-)

nixos/tests/couchdb.nix

@@ -14,7 +14,6 @@ let
   testpass = "cowabunga";
   testlogin = "${testuser}:${testpass}@";
 in
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "couchdb";
@@ -61,4 +60,3 @@ import ./make-test-python.nix (
       )
     '';
 }
-)

nixos/tests/crabfit.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { lib, pkgs, ... }:
 
 {
@@ -30,4 +29,3 @@ import ./make-test-python.nix (
     machine.succeed("curl -f http://localhost:3001/")
   '';
 }
-)

nixos/tests/croc.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 let
   client =
@@ -56,4 +55,3 @@ import ./make-test-python.nix (
     assert "Hello Earth" in receiver.succeed("cat testfile02.txt")
   '';
 }
-)

nixos/tests/curl-impersonate.nix

@@ -24,7 +24,6 @@
       uses upstream for its tests.
 */
 
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 let
   # Update with domains in TestImpersonate.TEST_URLS if needed from:
@@ -202,4 +201,3 @@ import ./make-test-python.nix (
           curl.succeed("${curl-impersonate-test}")
     '';
 }
-)

nixos/tests/dae.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { lib, pkgs, ... }:
 {
 
@@ -35,4 +34,3 @@ import ./make-test-python.nix (
   '';
 
 }
-)

nixos/tests/db-rest.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 {
   name = "db-rest";
@@ -122,4 +121,3 @@ import ./make-test-python.nix (
       client.succeed("curl --fail --get http://192.168.2.12:3000/stations --data-urlencode 'query=Köln Hbf' | jq -r '.\"8000207\".name' | grep 'Köln Hbf'")
   '';
 }
-)

nixos/tests/dconf.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { lib, ... }:
 {
   name = "dconf";
@@ -41,4 +40,3 @@ import ./make-test-python.nix (
     machine.succeed("sudo -u alice dbus-run-session -- dconf write /test/not/locked \"@i 2\"")
   '';
 }
-)

nixos/tests/ddns-updater.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 let
   port = 6000;
@@ -25,4 +24,3 @@ import ./make-test-python.nix (
     machine.succeed("curl --fail http://localhost:${toString port}/")
   '';
 }
-)

nixos/tests/deconz.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 let
   httpPort = 800;
@@ -34,4 +33,3 @@ import ./make-test-python.nix (
     machine.succeed("curl -sfL http://localhost:${toString httpPort}")
   '';
 }
-)

nixos/tests/deepin.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "deepin";
@@ -54,4 +53,3 @@ import ./make-test-python.nix (
           machine.screenshot("screen")
     '';
 }
-)

nixos/tests/deluge.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 {
   name = "deluge";
@@ -66,4 +65,3 @@ import ./make-test-python.nix (
     )
   '';
 }
-)

nixos/tests/dependency-track.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 let
   dependencyTrackPort = 8081;
@@ -68,4 +67,3 @@ import ./make-test-python.nix (
         server.succeed("curl http://localhost/ | grep \"<title>Dependency-Track</title>\"")
     '';
 }
-)

nixos/tests/devpi-server.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 let
   server-port = 3141;
@@ -40,4 +39,3 @@ import ./make-test-python.nix (
     client1.succeed("devpi getjson http://devpi:${builtins.toString server-port}")
   '';
 }
-)

nixos/tests/dex-oidc.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { lib, ... }:
 {
   name = "dex-oidc";
@@ -81,4 +80,3 @@ import ./make-test-python.nix (
         )
   '';
 }
-)

nixos/tests/disable-installer-tools.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 {
   pkgs,
   latestKernel ? false,
@@ -32,4 +31,3 @@ import ./make-test-python.nix (
         machine.fail("which perl")
   '';
 }
-)

nixos/tests/discourse.nix

@@ -3,7 +3,6 @@
 #  2. sending a private message to the admin user through the API
 #  3. replying to that message via email.
 
-import ./make-test-python.nix (
 {
   pkgs,
   lib,
@@ -208,4 +207,3 @@ import ./make-test-python.nix (
       )
     '';
 }
-)

nixos/tests/documize.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "documize";
@@ -64,4 +63,3 @@ import ./make-test-python.nix (
     )
   '';
 }
-)

nixos/tests/doh-proxy-rust.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { lib, pkgs, ... }:
 {
   name = "doh-proxy-rust";
@@ -45,4 +44,3 @@ import ./make-test-python.nix (
       machine.succeed(f"curl --fail -H 'Accept: application/dns-message' '{url}?dns={query}' | grep -F {bin_ip}")
     '';
 }
-)

nixos/tests/domination.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 {
   name = "domination";
@@ -30,4 +29,3 @@ import ./make-test-python.nix (
     machine.screenshot("screen")
   '';
 }
-)

nixos/tests/drbd-driver.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { lib, pkgs, ... }:
 {
   name = "drbd-driver";
@@ -21,4 +20,3 @@ import ./make-test-python.nix (
     machine.succeed("modinfo drbd | grep --extended-regexp '^version:\s+${pkgs.linuxPackages.drbd.version}$'")
   '';
 }
-)

nixos/tests/drbd.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 let
   drbdPort = 7789;
@@ -90,4 +89,3 @@ import ./make-test-python.nix (
       )
     '';
 }
-)

nixos/tests/dublin-traceroute.nix

@@ -3,7 +3,6 @@
 # client on the inside network, a server on the outside network, and a
 # router connected to both that performs Network Address Translation
 # for the client.
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 let
   routerBase = lib.mkMerge [
@@ -74,4 +73,3 @@ import ./make-test-python.nix (
     client.succeed("sudo -u alice dublin-traceroute server")
   '';
 }
-)

nixos/tests/ecryptfs.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { ... }:
 {
   name = "ecryptfs";
@@ -86,4 +85,3 @@ import ./make-test-python.nix (
     logout()
   '';
 }
-)

nixos/tests/endlessh-go.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { lib, pkgs, ... }:
 {
   name = "endlessh-go";
@@ -68,4 +67,3 @@ import ./make-test-python.nix (
         client.fail("curl -sSfm 5 server:92/metrics")
   '';
 }
-)

nixos/tests/endlessh.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { lib, pkgs, ... }:
 {
   name = "endlessh";
@@ -49,4 +48,3 @@ import ./make-test-python.nix (
         client.succeed("nc -dvW5 server 22")
   '';
 }
-)

nixos/tests/engelsystem.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "engelsystem";
@@ -42,4 +41,3 @@ import ./make-test-python.nix (
     )
   '';
 }
-)

nixos/tests/enlightenment.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 {
   name = "enlightenment";
@@ -101,4 +100,3 @@ import ./make-test-python.nix (
           machine.screenshot("terminology")
     '';
 }
-)

nixos/tests/env.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 {
   name = "environment";
@@ -46,4 +45,3 @@ import ./make-test-python.nix (
     machine.fail("printenv SHOULD_NOT_BE_SET")
   '';
 }
-)

nixos/tests/envfs.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { lib, pkgs, ... }:
 let
   pythonShebang = pkgs.writeScript "python-shebang" ''
@@ -39,4 +38,3 @@ import ./make-test-python.nix (
     assert out == "OK\n"
   '';
 }
-)

nixos/tests/ergo.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, ... }:
 {
   name = "ergo";
@@ -20,4 +19,3 @@ import ./make-test-python.nix (
     machine.wait_for_unit("ergo.service")
   '';
 }
-)

nixos/tests/ergochat.nix

@@ -9,7 +9,6 @@ let
   iiDir = "/tmp/irc";
 in
 
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "ergochat";
@@ -105,4 +104,3 @@ import ./make-test-python.nix (
     ''
     + lib.concatStrings (reduce (lib.zipListsWith (cs: c: cs + c)) (builtins.map clientScript clients));
 }
-)

nixos/tests/eris-server.nix

@@ -1,4 +1,3 @@
-import ./make-test-python.nix (
 { pkgs, lib, ... }:
 {
   name = "eris-server";
@@ -26,4 +25,3 @@ import ./make-test-python.nix (
     server.succeed("eriscmd get http://[::1] $(echo 'Hail ERIS!' | eriscmd put coap+tcp://[::1]:5683)")
   '';
 }
-)