fix: pass inputs arguments to modules

Fix nix-community/flakelight#22

examples/nixos/nix/homeModules/_default.nix

@@ -1,7 +1,8 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, inputs', ... }:
 
 {
   home.packages = [
     pkgs.hello
+    inputs'.greet.packages.greet
   ];
 }

examples/nixos/nix/nixosModules/_default.nix

@@ -1,7 +1,8 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 
 {
   environment.systemPackages = [
     pkgs.hello
+    inputs.greet.packages.${pkgs.system}.greet
   ];
 }

modules/config/argsModule.nix

@@ -0,0 +1,37 @@
+{ config, lib, conflake, ... }:
+
+let
+  inherit (builtins) mapAttrs;
+  inherit (lib) mkDefault mkOption types;
+
+  argsModule = { inputs, pkgs, ... }:
+    let
+      inherit (pkgs.stdenv.hostPlatform) system;
+      inputs' = mapAttrs (_: conflake.selectAttr system) inputs;
+    in
+    {
+      _file = ./argsModule.nix;
+
+      config = {
+        _module.args = mapAttrs (_: v: mkDefault v) {
+          inherit conflake inputs';
+          inherit (config) inputs;
+
+          self = inputs.self;
+          self' = inputs'.self;
+        };
+      };
+    };
+in
+{
+  options = {
+    argsModule = mkOption {
+      type = types.deferredModule;
+      default = argsModule;
+      internal = true;
+      description = ''
+        Module to provide extra args.
+      '';
+    };
+  };
+}

modules/homeModules.nix

@@ -1,6 +1,7 @@
 { config, lib, conflake, moduleArgs, ... }:
 
 let
+  inherit (builtins) mapAttrs;
   inherit (lib) mkOption mkIf mkMerge;
   inherit (lib.types) lazyAttrsOf;
   inherit (conflake.types) module nullable optCallWith;
@@ -14,6 +15,12 @@ in
 
     homeModules = mkOption {
       type = optCallWith moduleArgs (lazyAttrsOf module);
+      apply = mapAttrs (_: module: {
+        imports = [
+          config.argsModule
+          module
+        ];
+      });
       default = { };
     };
   };

modules/module-list.nix

@@ -1,4 +1,5 @@
 [
+  ./config/argsModule.nix
   ./apps.nix
   ./autoInputs.nix
   ./builtinFormatters.nix

modules/nixosModules.nix

@@ -1,6 +1,7 @@
 { config, lib, conflake, moduleArgs, ... }:
 
 let
+  inherit (builtins) mapAttrs;
   inherit (lib) mkOption mkIf mkMerge;
   inherit (lib.types) lazyAttrsOf;
   inherit (conflake.types) module nullable optCallWith;
@@ -14,6 +15,12 @@ in
 
     nixosModules = mkOption {
       type = optCallWith moduleArgs (lazyAttrsOf module);
+      apply = mapAttrs (_: module: {
+        imports = [
+          config.argsModule
+          module
+        ];
+      });
       default = { };
     };
   };

tests/default.nix

@@ -589,6 +589,18 @@ in
       description = "test template";
     });
 
+  template-fn = test
+    (conflake' {
+      template = { inputs, ... }: {
+        path = ./test;
+        description = "test template";
+      };
+    })
+    (f: f.templates.default == {
+      path = ./test;
+      description = "test template";
+    });
+
   templates = test
     (conflake' {
       templates.test-template = {
@@ -707,7 +719,7 @@ in
     }))
     (f: f ? nixosConfigurations.test.config.system.build.toplevel);
 
-  nixosConfigurationsManual = test
+  nixosConfigurations-manual = test
     (conflake' ({ lib, ... }: {
       nixosConfigurations.test = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
@@ -716,13 +728,13 @@ in
     }))
     (f: f ? nixosConfigurations.test.config.system.build.toplevel);
 
-  nixosConfigurationsManualWithProp = test
+  nixosConfigurations-manualWithProp = test
     (conflake' ({ lib, config, ... }: {
       nixosConfigurations.test = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
           config.propagationModule
-          ({ flake, ... }: {
+          ({ flake, inputs', ... }: {
             system.stateVersion = "24.05";
             environment.variables = {
               TEST1 = flake.inputs.nixpkgs.legacyPackages.x86_64-linux.hello;