streamline version

Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>

deployment/check/basic/default.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   runNixOSTest,
   inputs,
   sources,
@@ -10,10 +9,7 @@ runNixOSTest {
     ../common/nixosTest.nix
     ./nixosTest.nix
   ];
-  _module.args = {
+  _module.args = { inherit inputs sources; };
-    inherit inputs sources;
-    modulesPath = "${builtins.toString pkgs.path}/nixos/modules";
-  };
   inherit (import ./constants.nix)
     targetMachines
     pathToRoot

deployment/check/cli/default.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   runNixOSTest,
   inputs,
   sources,
@@ -10,10 +9,7 @@ runNixOSTest {
     ../common/nixosTest.nix
     ./nixosTest.nix
   ];
-  _module.args = {
+  _module.args = { inherit inputs sources; };
-    inherit inputs sources;
-    modulesPath = "${builtins.toString pkgs.path}/nixos/modules";
-  };
   inherit (import ./constants.nix)
     targetMachines
     pathToRoot

deployment/check/common/deployerNode.nix

@@ -3,7 +3,6 @@
   lib,
   pkgs,
   config,
-  modulesPath,
   sources,
   ...
 }:
@@ -76,7 +75,7 @@ in
           machine =
             (pkgs.nixos [
               ./targetNode.nix
-              "${modulesPath}/../lib/testing/nixos-test-base.nix"
+              "${sources.nixpkgs}/nixos/lib/testing/nixos-test-base.nix"
               config.system.extraDependenciesFromModule
               {
                 nixpkgs.hostPlatform = "x86_64-linux";

deployment/check/common/nixosTest.nix

@@ -4,7 +4,6 @@
   config,
   hostPkgs,
   sources,
-  modulesPath,
   ...
 }:
 
@@ -115,7 +114,7 @@ in
       (genAttrs config.targetMachines (_: {
         imports = [
           ./targetNode.nix
-        ] ++ (lib.optional config.useFlake "${modulesPath}/../lib/testing/nixos-test-base.nix");
+        ] ++ (lib.optional config.useFlake "${sources.nixpkgs}/nixos/lib/testing/nixos-test-base.nix");
         _module.args = { inherit inputs sources; };
         enableAcme = config.enableAcme;
         acmeNodeIP = if config.enableAcme then config.nodes.acme.networking.primaryIPAddress else null;

deployment/check/common/targetNode.nix

@@ -2,11 +2,11 @@
   inputs,
   config,
   lib,
-  modulesPath,
   ...
 }:
 
 let
+  sources = import ../../../npins;
   testCerts = import "${inputs.nixpkgs}/nixos/tests/common/acme/server/snakeoil-certs.nix";
   inherit (lib) mkIf mkMerge;
 
@@ -15,8 +15,7 @@ in
   _class = "nixos";
 
   imports = [
-    "${modulesPath}/profiles/minimal.nix"
+    "${sources.nixpkgs}/nixos/modules/profiles/qemu-guest.nix"
-    "${modulesPath}/profiles/qemu-guest.nix"
     ./sharedOptions.nix
   ];
 

deployment/check/common/targetResource.nix

@@ -3,7 +3,6 @@
   lib,
   config,
   sources,
-  modulesPath,
   ...
 }:
 
@@ -40,7 +39,7 @@ in
       imports = [
         ./targetNode.nix
         (lib.modules.importJSON (config.pathToCwd + "/${config.nodeName}-network.json"))
-        "${modulesPath}/../lib/testing/nixos-test-base.nix"
+        "${sources.nixpkgs}/nixos/lib/testing/nixos-test-base.nix"
       ];
 
       _module.args = { inherit inputs sources; };

deployment/check/common/utils.nix

@@ -1,6 +1,6 @@
 {
   lib,
-  modulesPath,
+  sources ? import ../../../npins,
   ...
 }:
 {
@@ -11,7 +11,7 @@
       imports = [
         ../common/sharedOptions.nix
         ../common/targetNode.nix
-        "${modulesPath}/profiles/qemu-guest.nix"
+        "${sources.nixpkgs}/nixos/modules/profiles/qemu-guest.nix"
       ];
 
       users.users = environment.config.resources."operator-environment".login-shell.apply {

deployment/check/data-model-nixops4/data-model.nix

@@ -1,7 +1,6 @@
 {
   config,
   system,
-  modulesPath,
   inputs,
   sources ? import ../../../npins,
   ...
@@ -10,7 +9,7 @@ let
   inherit (sources) nixpkgs;
   pkgs = import nixpkgs { inherit system; };
   inherit (pkgs) lib;
-  inherit (pkgs.callPackage ../common/utils.nix { inherit modulesPath; }) mkNixosConfiguration;
+  inherit (pkgs.callPackage ../common/utils.nix { }) mkNixosConfiguration;
   inherit (config)
     nodeName
     pathFromRoot
@@ -18,7 +17,7 @@ let
     ;
 in
 (pkgs.callPackage ../../utils.nix { inherit inputs; }).evalModel (
-  { config, modulesPath, ... }:
+  { config, ... }:
   {
     imports = [ ../common/model.nix ];
     config = {
@@ -45,7 +44,7 @@ in
                   nixos.module = {
                     imports = [
                       (mkNixosConfiguration environment required-resources)
-                      "${modulesPath}/../lib/testing/nixos-test-base.nix"
+                      "${sources.nixpkgs}/nixos/lib/testing/nixos-test-base.nix"
                     ];
                   };
                   _module.args = { inherit inputs sources; };

deployment/check/data-model-nixops4/default.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   runNixOSTest,
   inputs,
   sources,
@@ -12,10 +11,7 @@ runNixOSTest {
     ../common/nixosTest.nix
     ./nixosTest.nix
   ];
-  _module.args = {
+  _module.args = { inherit inputs sources; };
-    inherit inputs sources;
-    modulesPath = "${builtins.toString pkgs.path}/nixos/modules";
-  };
   inherit (import ./constants.nix)
     targetMachines
     pathToRoot

deployment/check/data-model-nixops4/flake-under-test.nix

@@ -7,7 +7,7 @@
   outputs =
     inputs:
     import ./mkFlake.nix inputs (
-      { inputs, modulesPath, ... }:
+      { inputs, ... }:
       let
         system = "x86_64-linux";
       in
@@ -18,7 +18,7 @@
 
         nixops4Deployments.check-deployment-model =
           (import ./deployment/check/data-model-nixops4/data-model.nix {
-            inherit system inputs modulesPath;
+            inherit system inputs;
             config = {
               inherit (import ./deployment/check/data-model-nixops4/constants.nix) pathToRoot pathFromRoot;
               nodeName = "nixops4";

deployment/check/data-model-ssh/data-model.nix

@@ -1,7 +1,6 @@
 {
   config,
   system,
-  modulesPath,
   sources ? import ../../../npins,
   ...
 }@args:
@@ -9,7 +8,7 @@ let
   inherit (sources) nixpkgs;
   pkgs = import nixpkgs { inherit system; };
   inherit (pkgs) lib;
-  inherit (pkgs.callPackage ../common/utils.nix { inherit modulesPath; }) mkNixosConfiguration;
+  inherit (pkgs.callPackage ../common/utils.nix { }) mkNixosConfiguration;
   inherit (config)
     nodeName
     pathToRoot
@@ -18,7 +17,7 @@ let
     ;
 in
 (pkgs.callPackage ../../utils.nix { }).evalModel (
-  { config, modulesPath, ... }:
+  { config, ... }:
   {
     imports = [ ../common/model.nix ];
     config = {
@@ -35,7 +34,7 @@ in
               nixos-configuration = {
                 imports = [
                   (mkNixosConfiguration environment required-resources)
-                  "${modulesPath}/../lib/testing/nixos-test-base.nix"
+                  "${sources.nixpkgs}/nixos/lib/testing/nixos-test-base.nix"
                 ];
               };
               system = targetSystem;

deployment/check/data-model-ssh/default.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   runNixOSTest,
   inputs,
   sources,
@@ -12,10 +11,7 @@ runNixOSTest {
     ../common/nixosTest.nix
     ./nixosTest.nix
   ];
-  _module.args = {
+  _module.args = { inherit inputs sources; };
-    inherit inputs sources;
-    modulesPath = "${builtins.toString pkgs.path}/nixos/modules";
-  };
   inherit (import ./constants.nix)
     targetMachines
     pathToRoot

deployment/check/data-model-ssh/nixosTest.nix

@@ -1,7 +1,6 @@
 {
   lib,
   pkgs,
-  modulesPath,
   ...
 }:
 let
@@ -9,7 +8,7 @@ let
   nodeName = "ssh";
   deploy =
     (import ./data-model.nix {
-      inherit system modulesPath;
+      inherit system;
       config = {
         inherit nodeName;
         inherit (import ./constants.nix) pathToRoot;

deployment/check/data-model-tf-proxmox/default.nix

@@ -42,10 +42,7 @@ pkgs.testers.runNixOSTest {
     ../common/nixosTest.nix
     ./nixosTest.nix
   ];
-  _module.args = {
+  _module.args = { inherit inputs sources; };
-    inherit inputs sources;
-    modulesPath = "${builtins.toString pkgs.path}/nixos/modules";
-  };
   inherit (import ./constants.nix)
     targetMachines
     pathToRoot

deployment/check/data-model-tf-proxmox/nixosTest.nix

@@ -1,7 +1,6 @@
 {
   lib,
   pkgs,
-  modulesPath,
   sources,
   ...
 }:
@@ -18,7 +17,7 @@ let
   # FIXME generate the image `nixos-generate` was to make, but now do it for a desired `-c configuration.nix` rather than whatever generic thing now
   template-deployment =
     (import ./setups/template.nix {
-      inherit sources system modulesPath;
+      inherit sources system;
       config = {
         httpBackend = tfBackend "proxmox-test/upload";
         nodeName = "pve";
@@ -29,7 +28,7 @@ let
     }).default.tf-proxmox-template;
   vm-deployment =
     (import ./setups/vm.nix {
-      inherit sources system modulesPath;
+      inherit sources system;
       config = {
         httpBackend = tfBackend "proxmox-test/nixos";
         inherit (import ./constants.nix) pathToRoot;

deployment/check/data-model-tf-proxmox/setups/template.nix

@@ -1,7 +1,6 @@
 {
   config,
   system,
-  modulesPath,
   sources ? import ../../../../npins,
   ...
 }:
@@ -9,7 +8,7 @@ let
   inherit (sources) nixpkgs;
   pkgs = import nixpkgs { inherit system; };
   inherit (pkgs) lib;
-  inherit (pkgs.callPackage ../../common/utils.nix { inherit modulesPath; }) mkNixosConfiguration;
+  inherit (pkgs.callPackage ../../common/utils.nix { inherit sources; }) mkNixosConfiguration;
   inherit (config)
     nodeName
     targetSystem

deployment/check/data-model-tf-proxmox/setups/vm.nix

@@ -1,7 +1,6 @@
 {
   config,
   system,
-  modulesPath,
   sources ? import ../../../../npins,
   ...
 }@args:
@@ -9,7 +8,7 @@ let
   inherit (sources) nixpkgs;
   pkgs = import nixpkgs { inherit system; };
   inherit (pkgs) lib;
-  inherit (pkgs.callPackage ../../common/utils.nix { inherit modulesPath; }) mkNixosConfiguration;
+  inherit (pkgs.callPackage ../../common/utils.nix { inherit sources; }) mkNixosConfiguration;
   inherit (config)
     nodeName
     pathToRoot

deployment/check/data-model-tf/data-model.nix

@@ -2,14 +2,13 @@
   config,
   system,
   sources ? import ../../../npins,
-  modulesPath,
   ...
 }@args:
 let
   inherit (sources) nixpkgs;
   pkgs = import nixpkgs { inherit system; };
   inherit (pkgs) lib;
-  inherit (pkgs.callPackage ../common/utils.nix { inherit modulesPath; }) mkNixosConfiguration;
+  inherit (pkgs.callPackage ../common/utils.nix { }) mkNixosConfiguration;
   inherit (config)
     nodeName
     pathToRoot
@@ -19,7 +18,7 @@ let
     ;
 in
 (pkgs.callPackage ../../utils.nix { }).evalModel (
-  { config, modulesPath, ... }:
+  { config, ... }:
   {
     imports = [ ../common/model.nix ];
     config = {
@@ -35,7 +34,7 @@ in
               nixos-configuration = {
                 imports = [
                   (mkNixosConfiguration environment required-resources)
-                  "${modulesPath}/../lib/testing/nixos-test-base.nix"
+                  "${sources.nixpkgs}/nixos/lib/testing/nixos-test-base.nix"
                 ];
               };
               system = targetSystem;

deployment/check/data-model-tf/default.nix

@@ -43,10 +43,7 @@ pkgs.testers.runNixOSTest {
     ../common/nixosTest.nix
     ./nixosTest.nix
   ];
-  _module.args = {
+  _module.args = { inherit inputs sources; };
-    inherit inputs sources;
-    modulesPath = "${builtins.toString pkgs.path}/nixos/modules";
-  };
   inherit (import ./constants.nix)
     targetMachines
     pathToRoot

deployment/check/data-model-tf/nixosTest.nix

@@ -2,7 +2,6 @@
   lib,
   pkgs,
   sources,
-  modulesPath,
   ...
 }:
 let
@@ -12,7 +11,7 @@ let
   backendPort = builtins.toString 8080;
   deploy =
     (import ./data-model.nix {
-      inherit system modulesPath;
+      inherit system;
       config = {
         inherit nodeName pathToRoot;
         targetSystem = system;

deployment/check/panel/default.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   runNixOSTest,
   inputs,
   sources,
@@ -10,10 +9,7 @@ runNixOSTest {
     ../common/nixosTest.nix
     ./nixosTest.nix
   ];
-  _module.args = {
+  _module.args = { inherit inputs sources; };
-    inherit inputs sources;
-    modulesPath = "${builtins.toString pkgs.path}/nixos/modules";
-  };
   inherit (import ./constants.nix)
     targetMachines
     pathToRoot

deployment/check/proxmox/default.nix

@@ -30,7 +30,6 @@ runNixOSTest {
       sources
       pkgs
       ;
-    modulesPath = "${builtins.toString pkgs.path}/nixos/modules";
   };
   imports = [
     ./proxmoxTest.nix

deployment/flake-part.nix

@@ -14,27 +14,27 @@
 
         deployment-basic = import ./check/basic {
           inherit (pkgs.testers) runNixOSTest;
-          inherit pkgs inputs sources;
+          inherit inputs sources;
         };
 
         deployment-cli = import ./check/cli {
           inherit (pkgs.testers) runNixOSTest;
-          inherit pkgs inputs sources;
+          inherit inputs sources;
         };
 
         deployment-panel = import ./check/panel {
           inherit (pkgs.testers) runNixOSTest;
-          inherit pkgs inputs sources;
+          inherit inputs sources;
         };
 
         deployment-model-ssh = import ./check/data-model-ssh {
           inherit (pkgs.testers) runNixOSTest;
-          inherit pkgs inputs sources;
+          inherit inputs sources;
         };
 
         deployment-model-nixops4 = import ./check/data-model-nixops4 {
           inherit (pkgs.testers) runNixOSTest;
-          inherit pkgs inputs sources;
+          inherit inputs sources;
         };
 
         deployment-model-tf = import ./check/data-model-tf {

deployment/utils.nix

@@ -10,7 +10,6 @@
     (lib.evalModules {
       specialArgs = {
         inherit pkgs inputs;
-        modulesPath = "${builtins.toString pkgs.path}/nixos/modules";
       };
       modules = [
         ./data-model.nix