Merge pull request 'build-clan: fix specialArgs not passed' (#1845) from DavHau/clan-core:DavHau-dave into main

lib/build-clan/default.nix

@@ -25,7 +25,8 @@ let
       specialArgs
       clan-core
       ;
-  } { self = directory; };
+    self = directory;
+  };
   meta = attrs.meta or { };
   rest = builtins.removeAttrs attrs [
     "meta"

lib/build-clan/eval.nix

@@ -3,16 +3,17 @@
   nixpkgs,
   clan-core,
   specialArgs ? { },
+  self,
 }:
 # Returns a function that takes self, which should point to the directory of the flake
-{ self }:
 module:
 (lib.evalModules {
   specialArgs = {
     inherit self clan-core nixpkgs;
-  } // specialArgs;
+  };
   modules = [
     ./interface.nix
     module
+    { inherit specialArgs; }
   ];
 }).config

lib/build-clan/tests.nix

@@ -6,10 +6,10 @@
   ...
 }:
 let
-  eval = import ./eval.nix { inherit lib nixpkgs clan-core; };
+  evalClan = import ./eval.nix {
-
+    inherit lib nixpkgs clan-core;
-  self = ./.;
+    self = ./.;
-  evalClan = eval { inherit self; };
+  };
 
 in
 #######
@@ -131,4 +131,22 @@ in
         "machine2"
       ];
     };
+
+  test_buildClan_specialArgs =
+    let
+      result = buildClan {
+        directory = ./.;
+        meta.name = "test";
+        specialArgs.foo = "dream2nix";
+        machines.machine2 =
+          { foo, ... }:
+          {
+            networking.hostName = foo;
+          };
+      };
+    in
+    {
+      expr = result.nixosConfigurations.machine2.config.networking.hostName;
+      expected = "dream2nix";
+    };
 }