feat: used haumea's scoped importers and freeze hive.load semantics

divnix · Apr 23, 2023 · 669cdfc · 669cdfc
1 parent 859b199
commit 669cdfc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -17,7 +17,7 @@
     disko.url = "github:divnix/blank";
     nixos-generators.url = "github:divnix/blank";
     home-manager.url = "github:divnix/blank";
-    haumea.url = "github:nix-community/haumea?ref=v0.2.0";
+    haumea.url = "github:nix-community/haumea?ref=v0.2.1";
     haumea.inputs.nixpkgs.follows = "nixpkgs";
   };
 
@@ -37,9 +37,14 @@
       with builtins;
         haumea.lib.load (removeAttrs args ["cell" "inputs"]
           // {
+            loader = haumea.lib.loaders.scoped;
+            transformer = with haumea.lib.transformers; [
+                liftDefault
+                (hoistLists "_imports" "imports")
+            ];
             # `self` in paisano refers to `inputs.self.sourceInfo` 😕
             # but is disallowed in haumea
-            inputs = removeAttrs (inputs // {inherit cell;}) ["self"];
+            inputs = removeAttrs (inputs // {inherit inputs cell;}) ["self"];
           });
   in
     haumea.lib