diff --git a/flake.lock b/flake.lock index 71f18a9..b3b848a 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ "yants": "yants" }, "locked": { - "lastModified": 1698920120, - "narHash": "sha256-WZp+URpmofB41FLzJySebl88Uinyed7QY6xLSjnnMks=", + "lastModified": 1699224044, + "narHash": "sha256-4gcOHdPINNRlA3OmNVYn+qtWuLeG10N2CWi50R4eUGw=", "owner": "gtrunsec", "repo": "flops", - "rev": "5e297f19c97d6b4d6e0e68072c883c70f170ae16", + "rev": "4aff40202cf1db539700d266636a6626b99157f9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 02bdd92..8b15ebc 100644 --- a/flake.nix +++ b/flake.nix @@ -6,16 +6,16 @@ outputs = { self, flops, ... }@inputs: let - library = import ./lib/__init.nix { inherit inputs; }; - lib = library.exports.default; + srcPops = import ./src/__init.nix { inherit inputs; }; + src = srcPops.exports.default; in - lib.flakeOutputs + src.flakeOutputs // { - pops = lib.pops // { - lib = library; + pops = src.pops // { + self = srcPops; }; - inherit lib; + inherit (src) lib; templates = { nixos = { diff --git a/lib/loaderInputs.nix b/lib/loaderInputs.nix deleted file mode 100644 index 0a9017d..0000000 --- a/lib/loaderInputs.nix +++ /dev/null @@ -1,6 +0,0 @@ -inputs.self.pops.lib.load.inputs -// { - omnibus = - (lib.recursiveUpdate root { pops.lib = inputs.self.pops.lib; }) - // root.flakeOutputs; -} diff --git a/lib/pops/load.nix b/lib/pops/load.nix deleted file mode 100644 index 37a1238..0000000 --- a/lib/pops/load.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - flops, - omnibus, - haumea, - root, -}: -load: -(flops.haumea.pops.default.setInit { - loader = with haumea; [ (matchers.nix loaders.scoped) ]; - inputs = root.loaderInputs; -}).addLoadExtender - { inherit load; } diff --git a/lib/pops/scripts.nix b/lib/pops/scripts.nix deleted file mode 100644 index 6d148ce..0000000 --- a/lib/pops/scripts.nix +++ /dev/null @@ -1,16 +0,0 @@ -let - inherit (inputs) nixpkgs; -in -(super.load { - inputs = - { - inherit nixpkgs; - inherit (root) makes; - inherit (root.makes) makeScript; - } - // lib.optionalAttrs (inputs ? climod) { - climod = nixpkgs.callPackage inputs.climod { pkgs = nixpkgs; }; - }; - loader = with haumea; [ (matchers.nix loaders.scoped) ]; - transformer = [ (_cursor: dir: if dir ? default then dir.default else dir) ]; -}) diff --git a/local/cells/repo/pops.nix b/local/cells/repo/pops.nix index 81c0564..0647963 100644 --- a/local/cells/repo/pops.nix +++ b/local/cells/repo/pops.nix @@ -2,7 +2,7 @@ let inherit (inputs) nixpkgs; inputs' = (inputs.omnibus.pops.flake.setSystem nixpkgs.system).inputs; - inherit (inputs.omnibus.pops.lib.load.inputs) POP flops; + inherit (inputs.omnibus.pops.self.load.inputs) POP flops; in { devshellProfiles = @@ -13,7 +13,7 @@ in POP.extendPop flops.haumea.pops.exporter ( self: super: { exports = rec { - inherit (inputs.omnibus.mapPopsExports pops) self; + inherit (inputs.omnibus.lib.mapPopsExports pops) self; pops.self = (self.layouts.default.addLoadExtender { load.inputs = { diff --git a/local/lock/flake.nix b/local/lock/flake.nix index 3fb4019..5d29e0c 100644 --- a/local/lock/flake.nix +++ b/local/lock/flake.nix @@ -53,7 +53,7 @@ sops-nix.inputs.nixpkgs.follows = "nixpkgs"; nixfmt.url = "github:serokell/nixfmt/?ref=refs/pull/118/head"; - # nixfmt.inputs.nixpkgs.follows = "nixpkgs"; + # nixfmt.inputs.flake-compat.follows = "nixpkgs"; nixfmt.inputs.flake-compat.follows = ""; }; diff --git a/lib/__init.nix b/src/__init.nix similarity index 100% rename from lib/__init.nix rename to src/__init.nix diff --git a/lib/errors/inputsSource.nix b/src/errors/inputsSource.nix similarity index 100% rename from lib/errors/inputsSource.nix rename to src/errors/inputsSource.nix diff --git a/lib/errors/requiredInputs.nix b/src/errors/requiredInputs.nix similarity index 100% rename from lib/errors/requiredInputs.nix rename to src/errors/requiredInputs.nix diff --git a/lib/flakeOutputs.nix b/src/flakeOutputs.nix similarity index 94% rename from lib/flakeOutputs.nix rename to src/flakeOutputs.nix index a808d31..2f52c55 100644 --- a/lib/flakeOutputs.nix +++ b/src/flakeOutputs.nix @@ -1,5 +1,5 @@ let - outputs = root.mapPopsExports super.pops; + outputs = root.lib.mapPopsExports super.pops; in { inherit (super) load; diff --git a/lib/addLoadToPops.nix b/src/lib/addLoadToPops.nix similarity index 100% rename from lib/addLoadToPops.nix rename to src/lib/addLoadToPops.nix diff --git a/src/lib/inputsToPaths.nix b/src/lib/inputsToPaths.nix new file mode 100644 index 0000000..d5d3e51 --- /dev/null +++ b/src/lib/inputsToPaths.nix @@ -0,0 +1,86 @@ +{ lib, flops }: +# let +# # Helper function to collect outPath attributes recursively +# collectPaths = +# input: +# lib.concatMap +# ( +# attr: +# let +# # Check for outPath or sourceInfo.outPath and collect if present +# paths = +# if lib.isAttrs attr then +# if attr ? outPath then +# [ attr.outPath ] +# else if attr ? sourceInfo && attr.sourceInfo ? outPath then +# [ attr.sourceInfo.outPath ] +# else +# [ ] +# else +# [ ]; +# # Recursively collect paths from nested inputs if they exist +# nestedPaths = +# if lib.isAttrs attr && attr ? inputs then collectPaths attr.inputs else [ ]; +# in +# paths ++ nestedPaths +# ) +# (lib.attrValues input); +# # Main function to collect outPath attributes from all inputs +# inputsToPaths = inputs: lib.flatten (collectPaths inputs); +# in +# # Example usage +# inputsToPaths +inputs: +let + l = lib; + + extractAttrsFromInputs = + inputs: + l.pipe inputs [ + (l.filterAttrs (_: v: l.isAttrs v && (v ? sourceInfo.outPath || v ? outPath))) + (l.mapAttrs (_: v: v.sourceInfo.outPath or v.outPath or v.path)) + (l.mapAttrs (_: v: toString v)) + ]; + + attrsToPaths = i: lib.attrValues (extractAttrsFromInputs i); + + inherit (flops) recursiveMerge; + updatedInputs = (recursiveMerge (l.flatten [ inputs ])); +in +l.pipe updatedInputs [ + ( + v: + map (x: if v.${x} ? inputs then attrsToPaths v.${x}.inputs else attrsToPaths v) + (l.attrNames (extractAttrsFromInputs v)) + ) + l.flatten + l.unique +] +++ attrsToPaths updatedInputs # extractPaths From the top level inputs +/* inputsToPaths { + b = { + inputs = { + d = { + outPath = ""; + }; + f = { + outPath = ""; + }; + }; + outPath = ""; + }; + a = { + inputs = { + b = { + outPath = ""; + }; + c = { + outPath = ""; + }; + }; + outPath = ""; + }; + } + => + [ "" "" "" "" "" "" ] +*/ diff --git a/src/lib/loaderInputs.nix b/src/lib/loaderInputs.nix new file mode 100644 index 0000000..189e8b8 --- /dev/null +++ b/src/lib/loaderInputs.nix @@ -0,0 +1,6 @@ +inputs.self.pops.self.load.inputs +// { + omnibus = + (lib.recursiveUpdate root { pops.self = inputs.self.pops.self; }) + // root.flakeOutputs; +} diff --git a/lib/mapLoadToPops.nix b/src/lib/mapLoadToPops.nix similarity index 100% rename from lib/mapLoadToPops.nix rename to src/lib/mapLoadToPops.nix diff --git a/lib/mapPopsExports'.nix b/src/lib/mapPopsExports'.nix similarity index 100% rename from lib/mapPopsExports'.nix rename to src/lib/mapPopsExports'.nix diff --git a/lib/mapPopsExports.nix b/src/lib/mapPopsExports.nix similarity index 100% rename from lib/mapPopsExports.nix rename to src/lib/mapPopsExports.nix diff --git a/lib/load.nix b/src/load.nix similarity index 100% rename from lib/load.nix rename to src/load.nix diff --git a/lib/mkHome.nix b/src/mkHome.nix similarity index 100% rename from lib/mkHome.nix rename to src/mkHome.nix diff --git a/lib/makes.nix b/src/ops/makes.nix similarity index 100% rename from lib/makes.nix rename to src/ops/makes.nix diff --git a/lib/ops/mkMicrovm.nix b/src/ops/mkMicrovm.nix similarity index 100% rename from lib/ops/mkMicrovm.nix rename to src/ops/mkMicrovm.nix diff --git a/lib/pops/allData.nix b/src/pops/allData.nix similarity index 100% rename from lib/pops/allData.nix rename to src/pops/allData.nix diff --git a/lib/pops/configs.nix b/src/pops/configs.nix similarity index 69% rename from lib/pops/configs.nix rename to src/pops/configs.nix index 1229e90..12389af 100644 --- a/lib/pops/configs.nix +++ b/src/pops/configs.nix @@ -1,4 +1,4 @@ flops.haumea.pops.default.setInit { src = projectDir + "/units/configs"; - inputs = root.loaderInputs; + inputs = root.lib.loaderInputs; } diff --git a/lib/pops/darwinModules.nix b/src/pops/darwinModules.nix similarity index 100% rename from lib/pops/darwinModules.nix rename to src/pops/darwinModules.nix diff --git a/lib/pops/darwinProfiles.nix b/src/pops/darwinProfiles.nix similarity index 100% rename from lib/pops/darwinProfiles.nix rename to src/pops/darwinProfiles.nix diff --git a/lib/pops/data.nix b/src/pops/data.nix similarity index 100% rename from lib/pops/data.nix rename to src/pops/data.nix diff --git a/lib/pops/devshellModules.nix b/src/pops/devshellModules.nix similarity index 100% rename from lib/pops/devshellModules.nix rename to src/pops/devshellModules.nix diff --git a/lib/pops/devshellProfiles.nix b/src/pops/devshellProfiles.nix similarity index 100% rename from lib/pops/devshellProfiles.nix rename to src/pops/devshellProfiles.nix diff --git a/lib/pops/flake-parts.nix b/src/pops/flake-parts.nix similarity index 100% rename from lib/pops/flake-parts.nix rename to src/pops/flake-parts.nix diff --git a/lib/pops/flake.nix b/src/pops/flake.nix similarity index 100% rename from lib/pops/flake.nix rename to src/pops/flake.nix diff --git a/lib/pops/homeModules.nix b/src/pops/homeModules.nix similarity index 76% rename from lib/pops/homeModules.nix rename to src/pops/homeModules.nix index 2203d87..a983b41 100644 --- a/lib/pops/homeModules.nix +++ b/src/pops/homeModules.nix @@ -1,5 +1,5 @@ flops.haumea.pops.default.setInit { src = projectDir + "/units/nixos/homeModules"; type = "nixosModules"; - inputs = root.loaderInputs; + inputs = root.lib.loaderInputs; } diff --git a/lib/pops/homeProfiles.nix b/src/pops/homeProfiles.nix similarity index 100% rename from lib/pops/homeProfiles.nix rename to src/pops/homeProfiles.nix diff --git a/src/pops/load.nix b/src/pops/load.nix new file mode 100644 index 0000000..a118eec --- /dev/null +++ b/src/pops/load.nix @@ -0,0 +1,19 @@ +{ + flops, + omnibus, + haumea, + root, +}: +let + inherit (flops) recursiveMerge'; +in +load: +(flops.haumea.pops.default.setInit ( + recursiveMerge' [ + { + loader = with haumea; [ (matchers.nix loaders.scoped) ]; + inputs = root.lib.loaderInputs; + } + load + ] +)) diff --git a/lib/pops/nixosModules.nix b/src/pops/nixosModules.nix similarity index 76% rename from lib/pops/nixosModules.nix rename to src/pops/nixosModules.nix index 07d3798..98d8878 100644 --- a/lib/pops/nixosModules.nix +++ b/src/pops/nixosModules.nix @@ -1,5 +1,5 @@ flops.haumea.pops.default.setInit { src = projectDir + "/units/nixos/nixosModules"; type = "nixosModules"; - inputs = root.loaderInputs; + inputs = root.lib.loaderInputs; } diff --git a/lib/pops/nixosProfiles.nix b/src/pops/nixosProfiles.nix similarity index 100% rename from lib/pops/nixosProfiles.nix rename to src/pops/nixosProfiles.nix diff --git a/src/pops/scripts.nix b/src/pops/scripts.nix new file mode 100644 index 0000000..6d6eb0d --- /dev/null +++ b/src/pops/scripts.nix @@ -0,0 +1,46 @@ +let + inherit (inputs) nixpkgs; + inherit (root.ops) makes; + inherit (makes) makeScript makeEnvVars; +in +(super.load { + inputs = + { + inherit + nixpkgs + makes + makeScript + makeEnvVars + ; + } + // lib.optionalAttrs (inputs ? climod) { + climod = nixpkgs.callPackage inputs.climod { pkgs = nixpkgs; }; + }; + loader = with haumea; [ (matchers.nix loaders.scoped) ]; + transformer = [ (_cursor: dir: if dir ? default then dir.default else dir) ]; +}) + +/* (matchers.regex "^(default)\\.(nix)" ( + _: _: path: + let + getDir = (list: builtins.elemAt list ((builtins.length list) - 3)) ( + l.split "/" path + ); + in + ( + if l.hasPrefix "makes-" getDir then + (scopedImport + ( + self.load.inputs + // { + # inherit (self.initLoad.inputs.makes) makeEnvVars; + makeEnvVars = self: self; + } + ) + path + ) + else + { } + ) + )) +*/ diff --git a/lib/pops/srvos.nix b/src/pops/srvos.nix similarity index 100% rename from lib/pops/srvos.nix rename to src/pops/srvos.nix diff --git a/lib/readYAML.nix b/src/readYAML.nix similarity index 100% rename from lib/readYAML.nix rename to src/readYAML.nix diff --git a/templates/hivebus/flake.lock b/templates/hivebus/flake.lock index 8036595..8a45fbc 100644 --- a/templates/hivebus/flake.lock +++ b/templates/hivebus/flake.lock @@ -83,11 +83,11 @@ "yants": "yants" }, "locked": { - "lastModified": 1698920120, - "narHash": "sha256-WZp+URpmofB41FLzJySebl88Uinyed7QY6xLSjnnMks=", + "lastModified": 1699224044, + "narHash": "sha256-4gcOHdPINNRlA3OmNVYn+qtWuLeG10N2CWi50R4eUGw=", "owner": "gtrunsec", "repo": "flops", - "rev": "5e297f19c97d6b4d6e0e68072c883c70f170ae16", + "rev": "4aff40202cf1db539700d266636a6626b99157f9", "type": "github" }, "original": { @@ -168,11 +168,11 @@ "flops": "flops" }, "locked": { - "lastModified": 1699139498, - "narHash": "sha256-0CeTgbtImHBWzv0Fd1wSbJQWVD5c6D9kOT1ZOCxjIpk=", + "lastModified": 1699261885, + "narHash": "sha256-lHabJCuz67zV09DWVaKWgfKOTpEh5V8skkm+QGc4vPY=", "owner": "gtrunsec", "repo": "omnibus", - "rev": "b057d85b45bc2e1d166bcafb92a6ef0a80c3d10f", + "rev": "2bba1526a97c4fdeda0e1c9e612e36fd23ecca91", "type": "github" }, "original": { diff --git a/templates/hivebus/nix/lib/flakeOutputs.nix b/templates/hivebus/nix/lib/flakeOutputs.nix index 05c3db0..111981f 100644 --- a/templates/hivebus/nix/lib/flakeOutputs.nix +++ b/templates/hivebus/nix/lib/flakeOutputs.nix @@ -12,7 +12,7 @@ let (lib.filterAttrs (_: v: v ? "${config}")) (lib.mapAttrs (_: v: v.${config})) ]; - inherit (omnibus) mapPopsExports; + inherit (omnibus.lib) mapPopsExports; in (mapPopsExports super.pops) // { diff --git a/templates/hivebus/nix/lib/pops/hosts.nix b/templates/hivebus/nix/lib/pops/hosts.nix index f8c3dca..7610a6e 100644 --- a/templates/hivebus/nix/lib/pops/hosts.nix +++ b/templates/hivebus/nix/lib/pops/hosts.nix @@ -7,7 +7,7 @@ }: let hostsDir = lib.attrNames (lib.readDir (projectDir + "/units/nixos/hosts")); - inherit (omnibus) addLoadToPops; + inherit (omnibus.lib) addLoadToPops; in addLoadToPops hostsDir super.hostsLoad ( elm: n: v: { diff --git a/templates/hivebus/nix/lib/pops/omnibus/lib.nix b/templates/hivebus/nix/lib/pops/omnibus/lib.nix index 130408f..5c97eab 100644 --- a/templates/hivebus/nix/lib/pops/omnibus/lib.nix +++ b/templates/hivebus/nix/lib/pops/omnibus/lib.nix @@ -1,4 +1,4 @@ -omnibus.pops.lib.addLoadExtender { +omnibus.pops.self.addLoadExtender { load.inputs = { inputs = inputs // root.pops.subflake.inputs; }; diff --git a/templates/nixos/flake.lock b/templates/nixos/flake.lock index 8036595..8a45fbc 100644 --- a/templates/nixos/flake.lock +++ b/templates/nixos/flake.lock @@ -83,11 +83,11 @@ "yants": "yants" }, "locked": { - "lastModified": 1698920120, - "narHash": "sha256-WZp+URpmofB41FLzJySebl88Uinyed7QY6xLSjnnMks=", + "lastModified": 1699224044, + "narHash": "sha256-4gcOHdPINNRlA3OmNVYn+qtWuLeG10N2CWi50R4eUGw=", "owner": "gtrunsec", "repo": "flops", - "rev": "5e297f19c97d6b4d6e0e68072c883c70f170ae16", + "rev": "4aff40202cf1db539700d266636a6626b99157f9", "type": "github" }, "original": { @@ -168,11 +168,11 @@ "flops": "flops" }, "locked": { - "lastModified": 1699139498, - "narHash": "sha256-0CeTgbtImHBWzv0Fd1wSbJQWVD5c6D9kOT1ZOCxjIpk=", + "lastModified": 1699261885, + "narHash": "sha256-lHabJCuz67zV09DWVaKWgfKOTpEh5V8skkm+QGc4vPY=", "owner": "gtrunsec", "repo": "omnibus", - "rev": "b057d85b45bc2e1d166bcafb92a6ef0a80c3d10f", + "rev": "2bba1526a97c4fdeda0e1c9e612e36fd23ecca91", "type": "github" }, "original": { diff --git a/templates/nixos/nix/lib/flakeOutputs.nix b/templates/nixos/nix/lib/flakeOutputs.nix index 05c3db0..111981f 100644 --- a/templates/nixos/nix/lib/flakeOutputs.nix +++ b/templates/nixos/nix/lib/flakeOutputs.nix @@ -12,7 +12,7 @@ let (lib.filterAttrs (_: v: v ? "${config}")) (lib.mapAttrs (_: v: v.${config})) ]; - inherit (omnibus) mapPopsExports; + inherit (omnibus.lib) mapPopsExports; in (mapPopsExports super.pops) // { diff --git a/templates/nixos/nix/lib/pops/hosts.nix b/templates/nixos/nix/lib/pops/hosts.nix index f8c3dca..7610a6e 100644 --- a/templates/nixos/nix/lib/pops/hosts.nix +++ b/templates/nixos/nix/lib/pops/hosts.nix @@ -7,7 +7,7 @@ }: let hostsDir = lib.attrNames (lib.readDir (projectDir + "/units/nixos/hosts")); - inherit (omnibus) addLoadToPops; + inherit (omnibus.lib) addLoadToPops; in addLoadToPops hostsDir super.hostsLoad ( elm: n: v: { diff --git a/templates/nixos/nix/lib/pops/omnibus/lib.nix b/templates/nixos/nix/lib/pops/omnibus/lib.nix index 130408f..5c97eab 100644 --- a/templates/nixos/nix/lib/pops/omnibus/lib.nix +++ b/templates/nixos/nix/lib/pops/omnibus/lib.nix @@ -1,4 +1,4 @@ -omnibus.pops.lib.addLoadExtender { +omnibus.pops.self.addLoadExtender { load.inputs = { inputs = inputs // root.pops.subflake.inputs; }; diff --git a/templates/simple/flake.nix b/templates/simple/flake.nix index 1238628..7469a10 100644 --- a/templates/simple/flake.nix +++ b/templates/simple/flake.nix @@ -35,7 +35,7 @@ }; omnibus = eachSystem ( system: - inputs.omnibus.pops.lib.addLoadExtender { + inputs.omnibus.pops.self.addLoadExtender { load.inputs = { inputs = { nixpkgs = inputs.nixos-unstable.legacyPackages.${system}; @@ -52,7 +52,7 @@ } ); }; - inherit (inputs.omnibus) mapPopsExports; + inherit (inputs.omnibus.lib) mapPopsExports; in mapPopsExports pops // { diff --git a/tests/_snapshots/lib b/tests/_snapshots/lib new file mode 100644 index 0000000..7bd837d --- /dev/null +++ b/tests/_snapshots/lib @@ -0,0 +1,11 @@ +#pretty +{ + inputsToPaths = [ + "" + "" + "" + "" + "" + "" + ]; +} \ No newline at end of file diff --git a/tests/data/expr.nix b/tests/data/expr.nix index fa0f96c..7e52966 100644 --- a/tests/data/expr.nix +++ b/tests/data/expr.nix @@ -2,7 +2,7 @@ let inherit (omnibus.flake.inputs) nixpkgs; allData = - (omnibus.pops.lib.addLoadExtender { + (omnibus.pops.self.addLoadExtender { load = { inputs = { inputs.nixpkgs = nixpkgs.legacyPackages.x86_64-linux; diff --git a/tests/lib/expr.nix b/tests/lib/expr.nix new file mode 100644 index 0000000..fbfaa28 --- /dev/null +++ b/tests/lib/expr.nix @@ -0,0 +1,30 @@ +{ omnibus }: +let + inherit (omnibus.lib) inputsToPaths; +in +{ + inputsToPaths = inputsToPaths { + b = { + inputs = { + d = { + outPath = ""; + }; + f = { + outPath = ""; + }; + }; + outPath = ""; + }; + a = { + inputs = { + b = { + outPath = ""; + }; + c = { + outPath = ""; + }; + }; + outPath = ""; + }; + }; +} diff --git a/tests/lib/format.nix b/tests/lib/format.nix new file mode 100644 index 0000000..f9e1770 --- /dev/null +++ b/tests/lib/format.nix @@ -0,0 +1 @@ +"pretty" diff --git a/tests/makes/expr.nix b/tests/makes/expr.nix index 927040b..a86f75a 100644 --- a/tests/makes/expr.nix +++ b/tests/makes/expr.nix @@ -2,7 +2,7 @@ let inherit (omnibus.flake.inputs) nixpkgs makes; omnibusLib = - (omnibus.pops.lib.addLoadExtender { + (omnibus.pops.self.addLoadExtender { load = { inputs = { inputs = { @@ -13,7 +13,7 @@ let }; }).exports.default; - inherit (omnibusLib.makes) makeScript; + inherit (omnibusLib.ops.makes) makeScript; in { scripts = diff --git a/tests/nixos/__fixture/layouts.nix b/tests/nixos/__fixture/layouts.nix index 3d9caa6..cd8ce85 100644 --- a/tests/nixos/__fixture/layouts.nix +++ b/tests/nixos/__fixture/layouts.nix @@ -1,9 +1,9 @@ let inherit (inputs) nixpkgs darwin nixos; # exports.default to be default - outputs = omnibus.mapPopsExports' super.pops; + outputs = omnibus.lib.mapPopsExports' super.pops; # with multi-layout - outputs' = omnibus.mapPopsExports super.pops; + outputs' = omnibus.lib.mapPopsExports super.pops; in { system = "x86_64-linux"; diff --git a/tests/nixos/__fixture/pops/omnibus.nix b/tests/nixos/__fixture/pops/omnibus.nix index 4727b5d..48a386b 100644 --- a/tests/nixos/__fixture/pops/omnibus.nix +++ b/tests/nixos/__fixture/pops/omnibus.nix @@ -1,4 +1,4 @@ -(omnibus.pops.lib.addLoadExtender { +(omnibus.pops.self.addLoadExtender { load.inputs = { inputs = inputs; };