lib.packagesFromDirectoryRecursive: default to creating new scopes wh…

…en `newScope` is provided
NixOS · Dec 1, 2024 · 57b51d0 · 57b51d0
1 parent ca8dad6
commit 57b51d0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/lib/filesystem.nix b/lib/filesystem.nix
@@ -349,12 +349,6 @@ in
 
     packagesFromDirectoryRecursive {
       inherit (pkgs) callPackage newScope;
-      recurseIntoDirectory = f: { newScope, ... }@args:
-        lib.recurseIntoAttrset (lib.makeScope newScope (self:
-          f (args // {
-            inherit (self) callPackage newScope;
-          })
-        ));
       directory = ./my-packages;
     }
     => { ... }
@@ -366,7 +360,18 @@ in
     {
       callPackage,
       directory,
-      recurseIntoDirectory ? lib.id,
+      recurseIntoDirectory ?
+        if args ? newScope then
+          # when `newScope` is provided, create a new scope when recursing into a directory (incl. the top one)
+          f: { newScope, ... }@args:
+            lib.recurseIntoAttrset (lib.makeScope newScope (self:
+              f (args // {
+                inherit (self) callPackage newScope;
+              })
+            ))
+        else
+          # otherwise, perform as usual
+          lib.id,
       ...
     }@args:
     if !pathIsDirectory directory then

diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
@@ -2529,12 +2529,6 @@ runTests {
   in {
     expr = lib.filterAttrsRecursive (name: value: !lib.elem name [ "callPackage" "newScope" "overrideScope" "packages" ]) (packagesFromDirectoryRecursive {
       inherit (emptyScope) callPackage newScope;
-      recurseIntoDirectory = f: { newScope, ... }@args:
-        recurseIntoAttrs (makeScope newScope (self:
-          f (args // {
-            inherit (self) callPackage newScope;
-          })
-        ));
       directory = ./packages-from-directory/scope;
     });
     expected = lib.recurseIntoAttrs {