diff --git a/src/flake/pops.nix b/src/flake/pops.nix index 0df4cb4..df225f9 100644 --- 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,7 +116,12 @@ 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 ) @@ -127,18 +129,6 @@ in 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 ] )