From 059f3aa9bab3916b2b548341d6b5c51dec92f428 Mon Sep 17 00:00:00 2001
From: xeals <dev@xeal.me>
Date: Sat, 3 Jan 2026 09:26:24 +1100
Subject: [PATCH] pkgs: use recurseIntoAttrs from lib

---
 pkgs/top-level/all-packages.nix | 12 ++++++------
 pkgs/top-level/stage.nix        |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 72dbe63..396539e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1,8 +1,8 @@
-{ pkgs }:
+{ pkgs, lib }:
 
 rec {
   # A functional Jetbrains IDE-with-plugins package set.
-  jetbrains = pkgs.dontRecurseIntoAttrs rec {
+  jetbrains = lib.dontRecurseIntoAttrs rec {
     jetbrainsPluginsFor = variant: import ../top-level/jetbrains-plugins.nix {
       inherit (pkgs) lib newScope stdenv fetchzip;
       inherit variant;
@@ -12,9 +12,9 @@ rec {
       inherit jetbrains jetbrainsPlatforms;
     };
 
-    clionPlugins = pkgs.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.clion);
-    ideaCommunityPlugins = pkgs.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-community);
-    ideaUltimatePlugins = pkgs.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-ultimate);
+    clionPlugins = lib.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.clion);
+    ideaCommunityPlugins = lib.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-community);
+    ideaUltimatePlugins = lib.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-ultimate);
 
     clionWithPlugins = clionPlugins.jetbrainsWithPlugins;
     ideaCommunityWithPlugins = ideaCommunityPlugins.jetbrainsWithPlugins;
@@ -25,7 +25,7 @@ rec {
     python3Packages = pkgs.python3Packages // python3Packages;
   };
 
-  python3Packages = pkgs.recurseIntoAttrs {
+  python3Packages = lib.recurseIntoAttrs {
     py-sonic = pkgs.python3.pkgs.callPackage ../development/python-modules/py-sonic { };
   };
 
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 90d1fc6..d0c5ad6 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -11,7 +11,7 @@ let
     import ./by-name-overlay.nix { inherit pkgs lib; } ../by-name;
 
   allPackages = _self: _super:
-    import ./all-packages.nix { inherit pkgs; };
+    import ./all-packages.nix { inherit pkgs lib; };
 
   toFix = (lib.flip lib.composeManyExtensions) (_self: { }) [
     autoCalledPackages