refactor: clarify the namespaces between makes and makesSrc

tao3k · Nov 6, 2023 · 5c3909e · 5c3909e
1 parent 0688bed
commit 5c3909e
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 23 deletions.
diff --git a/flake.nix b/flake.nix
@@ -15,7 +15,8 @@
         self = srcPops;
       };
 
-      inherit (src) lib;
+      inherit src;
+      inherit (src) lib ops errors;
 
       templates = {
         nixos = {

diff --git a/local/lock/flake.lock b/local/lock/flake.lock
diff --git a/local/lock/flake.nix b/local/lock/flake.nix
@@ -19,8 +19,8 @@
     fenix.url = "github:nix-community/fenix";
     fenix.inputs.nixpkgs.follows = "nixpkgs";
 
-    makes.url = "github:fluidattacks/makes";
-    makes.flake = false;
+    makesSrc.url = "github:fluidattacks/makes";
+    makesSrc.flake = false;
 
     nur.url = "github:nix-community/NUR";
 
@@ -58,8 +58,8 @@
   };
 
   inputs = {
-    climod.url = "github:nixosbrasil/climod";
-    climod.flake = false;
+    climodSrc.url = "github:nixosbrasil/climod";
+    climodSrc.flake = false;
   };
   outputs = _: { };
 }
diff --git a/src/ops/makes.nix b/src/ops/makes.nix
@@ -6,12 +6,12 @@
 let
   l = nixpkgs.lib // builtins;
   inherit
-    (root.errors.requiredInputs inputs "lib" [
+    (root.errors.requiredInputs inputs "omnibus.pops.self" [
       "nixpkgs"
-      "makes"
+      "makesSrc"
     ])
     nixpkgs
-    makes
+    makesSrc
   ;
 in
 l.fix (
@@ -22,6 +22,6 @@ l.fix (
       __nixpkgs__ = nixpkgs;
       __nixpkgsSrc__ = nixpkgs.path;
     })
-    (import (makes + /src/args/agnostic.nix) { inherit (nixpkgs) system; })
+    (import (makesSrc + /src/args/agnostic.nix) { inherit (nixpkgs) system; })
     .__unfix__
 )
diff --git a/src/readYAML.nix → src/ops/readYAML.nix b/src/readYAML.nix → src/ops/readYAML.nix
diff --git a/src/pops/allData.nix b/src/pops/allData.nix
@@ -3,7 +3,7 @@
     loader = with haumea; [
       (matchers.regex "^(.+)\\.(yaml|yml)$" (
         _: _: path:
-        root.readYAML path
+        root.ops.readYAML path
       ))
     ];
   };

diff --git a/src/pops/scripts.nix b/src/pops/scripts.nix
@@ -8,14 +8,14 @@ in
     {
       inherit nixpkgs;
     }
-    // lib.optionalAttrs (inputs ? climod) {
-      climod = nixpkgs.callPackage inputs.climod { pkgs = nixpkgs; };
+    // lib.optionalAttrs (inputs ? climodSrc) {
+      climod = nixpkgs.callPackage inputs.climodSrc { pkgs = nixpkgs; };
     }
-    // lib.optionalAttrs (inputs ? makes) (
+    // lib.optionalAttrs (inputs ? makesSrc) (
       makes
       // {
         inputs = {
-          makesLib = makes;
+          inherit makes;
         };
       }
     );

diff --git a/tests/makes/expr.nix b/tests/makes/expr.nix
@@ -1,13 +1,13 @@
 { omnibus, lib }:
 let
-  inherit (omnibus.flake.inputs) nixpkgs makes;
+  inherit (omnibus.flake.inputs) nixpkgs makesSrc;
   omnibusLib =
     (omnibus.pops.self.addLoadExtender {
       load = {
         inputs = {
           inputs = {
             nixpkgs = nixpkgs.legacyPackages.x86_64-linux;
-            inherit makes;
+            inherit makesSrc;
           };
         };
       };