diff --git a/deployment/check/basic/flake-part.nix b/deployment/check/basic/flake-part.nix index 6344f0f0..0341a2c0 100644 --- a/deployment/check/basic/flake-part.nix +++ b/deployment/check/basic/flake-part.nix @@ -2,6 +2,7 @@ self, inputs, lib, + sources, ... }: @@ -27,7 +28,9 @@ in ../common/nixosTest.nix ./nixosTest.nix ]; - _module.args.inputs = inputs; + _module.args = { + inherit inputs sources; + }; inherit targetMachines pathToRoot pathFromRoot; }; }; @@ -44,7 +47,9 @@ in inputs.nixops4-nixos.modules.nixops4Resource.nixos ../common/targetResource.nix ]; - _module.args.inputs = inputs; + _module.args = { + inherit inputs sources; + }; inherit nodeName pathToRoot pathFromRoot; nixos.module = { pkgs, ... }: diff --git a/deployment/check/common/deployerNode.nix b/deployment/check/common/deployerNode.nix index 048bba5a..89466328 100644 --- a/deployment/check/common/deployerNode.nix +++ b/deployment/check/common/deployerNode.nix @@ -3,6 +3,7 @@ lib, pkgs, config, + sources, ... }: @@ -14,8 +15,6 @@ let types ; - sources = import ../../../npins; - in { _class = "nixos"; diff --git a/deployment/check/common/nixosTest.nix b/deployment/check/common/nixosTest.nix index fc0e935f..a16544cd 100644 --- a/deployment/check/common/nixosTest.nix +++ b/deployment/check/common/nixosTest.nix @@ -3,6 +3,7 @@ lib, config, hostPkgs, + sources, ... }: @@ -61,7 +62,9 @@ in { deployer = { imports = [ ./deployerNode.nix ]; - _module.args.inputs = inputs; + _module.args = { + inherit inputs sources; + }; enableAcme = config.enableAcme; acmeNodeIP = config.nodes.acme.networking.primaryIPAddress; }; diff --git a/flake.nix b/flake.nix index dbf01ff0..8b48e7d4 100644 --- a/flake.nix +++ b/flake.nix @@ -31,6 +31,9 @@ inherit nixpkgs; }; self = self'; + specialArgs = { + inherit sources; + }; } ( { inputs, ... }: diff --git a/infra/flake-part.nix b/infra/flake-part.nix index 31cdc5a3..24af4ec2 100644 --- a/infra/flake-part.nix +++ b/infra/flake-part.nix @@ -1,6 +1,7 @@ { inputs, lib, + sources, ... }: @@ -13,7 +14,6 @@ let filterAttrs ; inherit (lib.attrsets) genAttrs; - sources = import ../../npins; ## Given a machine's name and whether it is a test VM, make a resource module, ## except for its missing provider. (Depending on the use of that resource, we