chore: reorg the args

lib/exporter/flakeOutputs.nix

@@ -12,6 +12,8 @@ let
 in
 {
   inherit (outputs) srvos;
+  __inputs__ = super.pops.loadInputs.outputs;
+
   dotfiles = inputs.self.outPath + "/dotfiles";
 
   devshellModules = outputs.devshell.loadModules;

lib/exporter/pops.nix

@@ -11,6 +11,7 @@ in
   loadInputs = flops.flake.pops.default.setInitInputs (
     inputs.self.outPath + "/local/lock"
   );
+
   loadData = flops.haumea.pops.default.setInit {
     loader = with haumea; [
       matchers.json

local/flake.nix

@@ -3,8 +3,6 @@
 
   inputs.std.follows = "std-ext/std";
   inputs.nixpkgs.follows = "std-ext/nixpkgs";
-  inputs.darwin.url = "github:LnL7/nix-darwin";
-  inputs.darwin.inputs.nixpkgs.follows = "nixpkgs";
 
   inputs.std-ext.url = "github:gtrunsec/std-ext";
   inputs.std-ext.inputs.org-roam-book-template.follows = "";
@@ -39,18 +37,16 @@
         eval = inputs.haumea.lib.load {
           src = ../tests;
           inputs = omnibus.inputs // {
-            omnibus = omnibus;
+            inherit omnibus inputs;
             lib = inputs.nixpkgs.lib // builtins;
-            inputs' = inputs;
             trace = true;
           };
         };
         checks = inputs.namaka.lib.load {
           src = ../tests;
           inputs = omnibus.inputs // {
-            omnibus = omnibus;
+            inherit omnibus inputs;
             lib = inputs.nixpkgs.lib // builtins;
-            inputs' = inputs;
             trace = false;
           };
         };

local/lock/flake.nix

@@ -6,6 +6,9 @@
 
     srvos.url = "github:numtide/srvos";
     srvos.inputs.nixpkgs.follows = "nixpkgs";
+
+    darwin.url = "github:LnL7/nix-darwin";
+    darwin.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   inputs = {

tests/data/expr.nix

@@ -1,10 +1,11 @@
-{ omnibus, inputs' }:
+{ omnibus }:
 let
+  inherit (omnibus.__inputs__) nixpkgs;
   loadDataAll =
     (omnibus.pops.lib.addLoadExtender {
       load = {
         inputs = {
-          inputs.nixpkgs = inputs'.nixpkgs.legacyPackages.x86_64-linux;
+          inputs.nixpkgs = nixpkgs.legacyPackages.x86_64-linux;
         };
       };
     }).layouts.default.loadDataAll;

tests/flake-parts/expr.nix

@@ -3,11 +3,11 @@
   POP,
   flops,
   lib,
-  inputs',
+  inputs,
 }:
 let
   system = "x86_64-linux";
-  inputs =
+  inputs' =
     let
       loadInputs = omnibus.pops.loadInputs.setInitInputs ./__lock;
     in
@@ -27,25 +27,25 @@ let
     (omnibus.pops.flake-parts.loadProfiles.addLoadExtender {
       load = {
         inputs = {
-          inherit (inputs) nixpkgs;
+          inherit (inputs') nixpkgs;
           inputs = {
-            inherit (inputs) chinookDb;
+            inherit (inputs') chinookDb;
           };
         };
       };
     }).layouts.default.process-compose;
 
   mkFlake =
-    inputs.flake-parts.lib.mkFlake
+    inputs'.flake-parts.lib.mkFlake
       {
-        inputs = inputs // {
+        inputs = inputs' // {
           # fake self argument to make sure that the flake is
-          self = inputs'.self;
+          self = inputs.self;
         };
       }
       {
         systems = [ system ];
-        imports = [ inputs.process-compose-flake.flakeModule ];
+        imports = [ inputs'.process-compose-flake.flakeModule ];
         perSystem =
           { selfModule', ... }: { imports = [ flakePartsProfiles.sqlite-example ]; };
       };

tests/nixos/__fixture/layouts.nix

@@ -1,4 +1,5 @@
 let
+  inherit (inputs) nixpkgs darwin;
   exporter = lib.mapAttrs (_: v: v.layouts) (
     lib.removeAttrs super.pops [ "inputs" ]
   );

tests/nixos/_pops.nix

@@ -1,15 +1,12 @@
-{
-  omnibus,
-  root,
-  inputs',
-}:
+{ omnibus, root }:
 (omnibus.pops.exporter.addLoadExtender {
   load = {
     src = ./__fixture;
     inputs = {
       data = root.data;
-      nixpkgs = inputs'.nixpkgs;
-      darwin = inputs'.darwin;
+      inputs = {
+        inherit (omnibus.__inputs__) darwin nixpkgs;
+      };
     };
   };
 })