chore(templates/packages): pass the __inputs__ to callPackage

tao3k · Nov 19, 2023 · 5c45df2 · 5c45df2
1 parent d7b39da
commit 5c45df2
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 9 deletions.
diff --git a/local/examples/overlays/__fixture/test1.nix → examples/overlays/__fixture/test1.nix b/local/examples/overlays/__fixture/test1.nix → examples/overlays/__fixture/test1.nix
diff --git a/local/examples/overlays/__fixture/test2.nix → examples/overlays/__fixture/test2.nix b/local/examples/overlays/__fixture/test2.nix → examples/overlays/__fixture/test2.nix
diff --git a/local/examples/overlays/default.nix → examples/overlays/default.nix b/local/examples/overlays/default.nix → examples/overlays/default.nix
diff --git a/local/examples/packages/__fixture/hello1.nix → examples/packages/__fixture/hello1.nix b/local/examples/packages/__fixture/hello1.nix → examples/packages/__fixture/hello1.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   runtimeShell,
+  __inputs__,
 }:
 
 stdenv.mkDerivation {
@@ -19,6 +20,9 @@ stdenv.mkDerivation {
     chmod +x $out/bin/hello-unfree
   '';
 
+  passthru = {
+    test = __inputs__;
+  };
   meta = {
     description = "An example package with unfree license (for testing)";
     maintainers = [ lib.maintainers.oxij ];

diff --git a/local/examples/packages/__fixture/hello2.nix → examples/packages/__fixture/hello2.nix b/local/examples/packages/__fixture/hello2.nix → examples/packages/__fixture/hello2.nix
diff --git a/local/examples/packages/default.nix → examples/packages/default.nix b/local/examples/packages/default.nix → examples/packages/default.nix
@@ -1,4 +1,8 @@
-{ omnibus, inputs }:
+{
+  omnibus,
+  inputs,
+  self,
+}:
 omnibus.pops.packages {
   src = ./__fixture;
   inputs = {

diff --git a/local/examples/packagesOverlay.nix → examples/packagesOverlay.nix b/local/examples/packagesOverlay.nix → examples/packagesOverlay.nix
diff --git a/local/flake.nix b/local/flake.nix
@@ -67,7 +67,7 @@
       }
       {
         examples = omnibus.load {
-          src = ./examples;
+          src = ../examples;
           transformer = [ (_cursor: dir: if dir ? default then dir.default else dir) ];
           inputs = inputs.nixpkgs.lib.recursiveUpdate omnibus.lib.loaderInputs {
             inherit inputs;

diff --git a/src/pops/packages.nix b/src/pops/packages.nix
@@ -9,21 +9,31 @@ let
   inherit (nixpkgs.lib) makeScope;
 in
 makeScope newScope (
-  self:
-  let
-    inherit (self) callPackage;
-  in
+  pkgs:
   ((super.load load).addLoadExtender {
-    load.loader = _: path: callPackage path { };
+    load = {
+      loader =
+        __inputs__: path:
+        (pkgs.overrideScope (_: _: { inherit __inputs__; })).callPackage path { };
+      transformer = [ (_cursor: dir: if dir ? default then dir.default else dir) ];
+    };
   }).addExporters
     [
       (POP.extendPop flops.haumea.pops.exporter (
         self: _super: {
           exports = {
             overlay =
               final: prev:
-              (self.layouts.self.addLoadExtender { load.inputs.inputs.nixpkgs = final; })
-              .exports.default;
+              (self.layouts.self.addLoadExtender {
+                load = {
+                  inputs.inputs.nixpkgs = final;
+                  loader =
+                    __inputs__: path:
+                    (__inputs__.inputs.nixpkgs.extend (_: _: { inherit __inputs__; })).callPackage
+                      path
+                      { };
+                };
+              }).exports.default;
           };
         }
       ))