chore: clean path

tao3k · Oct 17, 2023 · 8e985bc · 8e985bc
1 parent dd2aeb1
commit 8e985bc
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 68 deletions.
diff --git a/src/__lib/__lock/flake.lock b/src/__lib/__lock/flake.lock
diff --git a/src/__lib/__lock/flake.nix b/src/__lib/__lock/flake.nix
@@ -1,11 +1,6 @@
 {
   inputs = {
     nosys.url = "github:divnix/nosys";
-    flake-compat = {
-      url = "github:gtrunsec/flake-compat/lockFile";
-      flake = false;
-    };
-    call-flake.url = "github:divnix/call-flake";
   };
   outputs = _: { };
 }
diff --git a/src/__lib/call-flake-override.nix b/src/__lib/call-flake-override.nix
diff --git a/src/flake/pops.nix b/src/flake/pops.nix
@@ -16,33 +16,36 @@ let
     mergeToDepth
     foldl
     filter
-    call-flake-override
+    deSystemize
   ;
-
-  __inputs__ = (call-flake ../__lib/__lock).inputs;
 in
 {
   inputsExtender = pop {
     defaults = {
       initInputs = { };
       inputs = { };
       sysInputs = { };
-      overrideInputs = { };
+      initFlake = {
+        inputs = { };
+        outputs = { };
+      };
     };
     extension = self: super: {
       setInitInputs =
         (
           initInputs:
           extendPop self (
             self: super: {
-              initInputs =
+              initFlake =
                 if (lib.isPath initInputs || lib.isString initInputs) then
-                  call-flake-override initInputs self.overrideInputs
+                  call-flake initInputs
                 else if lib.hasAttr "outPath" initInputs then
-                  call-flake-override initInputs.outPath self.overrideInputs
+                  call-flake initInputs.outPath
                 else
-                  initInputs
+                  super.initFlake
               ;
+              initInputs =
+                if self.initFlake == { } then initInputs else self.initFlake.inputs;
             }
           )
         );
@@ -100,9 +103,7 @@ in
     extension =
       self: super:
       let
-        deSysInputs =
-          mapAttrs (_: input: __inputs__.nosys.lib.deSys self.system input)
-            extendedInputs;
+        deSysInputs = mapAttrs (_: input: deSystemize self.system input) extendedInputs;
 
         extendedInputs =
           foldl
@@ -244,11 +245,11 @@ in
             )
             (
               systems:
-              foldl (attrs: system: mergeToDepth 3 attrs (self.outputsForSystem system)) { }
-                systems
+              lib.recursiveUpdate self.initFlake.outputs (
+                foldl (attrs: system: mergeToDepth 3 attrs (self.outputsForSystem system)) { }
+                  systems
+              )
             );
-
-        outputs = self.inputs;
       };
   };
 }
diff --git a/src/haumea/pops.nix b/src/haumea/pops.nix
@@ -134,7 +134,7 @@ let
                 if (extender ? setInit) then
                   (extender.setInit self.initLoad).load
                 else
-                  extender.load
+                  extender.load or { }
               ;
             in
             l.recursiveMerge ([

diff --git a/tests/_snapshots/flake b/tests/_snapshots/flake
@@ -10,7 +10,7 @@
       };
     };
   };
-  outputs = {
+  inputs = {
     flake-compat = {
       lastModified = 1683211519;
       lastModifiedDate = "20230504144519";

diff --git a/tests/flake/expr.nix b/tests/flake/expr.nix
@@ -50,9 +50,9 @@ let
           ))
         ]
       )
-    ).outputs;
+    ).inputs;
 in
 {
   exampleFlake = exampleFlake.outputs exampleFlake.inputs;
-  outputs = outputs ./__lock;
+  inputs = outputs ./__lock;
 }