chore: update flake

tao3k · Dec 4, 2023 · 97ca9d7 · 97ca9d7
1 parent a3fb530
commit 97ca9d7
Showing 1 changed file with 7 additions and 34 deletions.
diff --git a/src/flake/pops.nix b/src/flake/pops.nix
@@ -49,8 +49,6 @@ in
             }
           )
         );
-      setOverrideInputs =
-        (overrideInputs: extendPop self (self: super: { inherit overrideInputs; }));
     };
   };
 
@@ -97,7 +95,6 @@ in
     ];
     defaults = {
       inputsExtenders = [ ];
-      inputsOverrideExtenders = [ ];
       exporters = [ ];
     };
     extension =
@@ -119,26 +116,19 @@ in
             (
               cinputs: extender:
               let
-                ext' = extender.setInitInputs self.initInputs;
+                ext' =
+                  if extender ? setInitInputs then
+                    extender.setInitInputs self.initInputs
+                  else
+                    extender
+                ;
               in
               mergeToDepth 3 cinputs ext'.inputs
             )
             self.initInputs
             self.inputsExtenders;
       in
       {
-        overrideInputs =
-          foldl
-            (
-              acc: ext:
-              let
-                ext' = ext.setInitInputs extendedInputs;
-              in
-              acc // ext'.overrideInputs
-            )
-            { }
-            self.inputsOverrideExtenders;
-
         sysInputs = extendedInputs;
 
         inputs = deSysInputs;
@@ -158,23 +148,6 @@ in
             general = foldExporters self.generalExporters;
           };
 
-        addInputsOverrideExtenders =
-          (
-            inputsOverrideExtenders:
-            extendPop self (
-              self: super: {
-                inputsOverrideExtenders =
-                  super.inputsOverrideExtenders ++ inputsOverrideExtenders;
-              }
-            )
-          );
-
-        addInputsOverrideExtender =
-          (
-            inputsOverrideExtender:
-            self.addInputsOverrideExtenders [ inputsOverrideExtender ]
-          );
-
         addInputsExtenders =
           defun
             (
@@ -194,7 +167,7 @@ in
           defun
             (
               with types; [
-                inputsExtenderPop
+                (either inputsExtenderPop (attrs any))
                 flakePop
               ]
             )