chore: update flops

tao3k · Nov 8, 2023 · 29f9cff · 29f9cff
1 parent a7ba8ce
commit 29f9cff
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/src/pops/data.nix b/src/pops/data.nix
@@ -2,5 +2,7 @@ flops.haumea.pops.default.setInit {
   loader = with haumea; [
     matchers.json
     matchers.toml
+    (matchers.nix loaders.scoped)
+    (matchers.nix loaders.default)
   ];
 }
diff --git a/src/pops/std.nix b/src/pops/std.nix
@@ -1,10 +1,20 @@
+{
+  root,
+  haumea,
+  projectDir,
+}:
+load:
 let
-  inherit (root.errors.requiredInputs inputs "omnibus.pops.self" [ "std" ]) std;
+  inherit
+    (root.errors.requiredInputs load.inputs.inputs "omnibus.pops.std" [ "std" ])
+    std
+  ;
 in
-super.load {
+(super.load {
   loader = with haumea; [ (matchers.nix loaders.scoped) ];
   src = projectDir + "/units/std";
-  inputs.inputs = {
+  inpputs.inputs = {
     inherit std;
   };
-}
+}).addLoadExtender
+  { inherit load; }
diff --git a/tests/flake-parts/expr.nix b/tests/flake-parts/expr.nix
@@ -8,20 +8,7 @@
 let
   system = "x86_64-linux";
   flake.inputs =
-    let
-      flake = omnibus.pops.flake.setInitInputs ./__lock;
-    in
-    ((flake.addInputsExtender (
-      POP.extendPop flops.flake.pops.inputsExtender (
-        self: super: {
-          inputs = {
-            nixpkgs = flake.inputs.nixpkgs.legacyPackages;
-          };
-        }
-      )
-    )).setSystem
-      system
-    ).inputs;
+    ((omnibus.pops.flake.setInitInputs ./__lock).setSystem system).inputs;
 
   flakeProfiles =
     (omnibus.pops.flake-parts.profiles.addLoadExtender {