pkgs/by-name: make callPackage intrinsic

ngi-nix · Jun 5, 2024 · 98203d7 · 98203d7
1 parent 5cf0253
commit 98203d7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/flake.nix b/flake.nix
@@ -69,17 +69,11 @@
         // args);
 
     # NGI packages are imported from ./pkgs/by-name/default.nix.
-    importNgiPackages = pkgs: let
-      callPackage = pkgs.newScope (
-        ngiPackages // {inherit callPackage;}
-      );
-
-      ngiPackages = import ./pkgs/by-name {
+    importNgiPackages = pkgs:
+      import ./pkgs/by-name {
         inherit (pkgs) lib;
-        inherit callPackage dream2nix pkgs;
+        inherit dream2nix pkgs;
       };
-    in
-      ngiPackages;
 
     # NGI projects are imported from ./projects/default.nix.
     # Each project includes packages, and optionally, modules, configurations and tests.

diff --git a/pkgs/by-name/default.nix b/pkgs/by-name/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  callPackage,
   dream2nix,
   pkgs,
 }: let
@@ -28,7 +27,7 @@
   callModule = module: let
     evaluated = lib.evalModules {
       specialArgs = {
-        inherit dream2nix;
+        dream2nix = import dream2nix;
         packageSets.nixpkgs = pkgs;
       };
       modules = [
@@ -44,6 +43,10 @@
   in
     evaluated.config.public;
 
+  callPackage = pkgs.newScope (
+    self // {inherit callPackage;}
+  );
+
   self =
     mapAttrs (
       _: directory: