xeals/nur-packages
1
0
Fork 0
Code Issues Pull Requests Actions Wiki Activity

pkgs: use recurseIntoAttrs from lib

Browse Source
This commit is contained in:
xeals
2026-01-03 09:26:24 +11:00
parent 11657f9c90
commit 059f3aa9ba
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/top-level/all-packages.nix
View File

@@ -1,8 +1,8 @@
{ pkgs }: { pkgs, lib }:
rec { rec {
# A functional Jetbrains IDE-with-plugins package set. # A functional Jetbrains IDE-with-plugins package set.
jetbrains = pkgs.dontRecurseIntoAttrs rec { jetbrains = lib.dontRecurseIntoAttrs rec {
jetbrainsPluginsFor = variant: import ../top-level/jetbrains-plugins.nix { jetbrainsPluginsFor = variant: import ../top-level/jetbrains-plugins.nix {
inherit (pkgs) lib newScope stdenv fetchzip; inherit (pkgs) lib newScope stdenv fetchzip;
inherit variant; inherit variant;
@@ -12,9 +12,9 @@ rec {
inherit jetbrains jetbrainsPlatforms; inherit jetbrains jetbrainsPlatforms;
}; };
clionPlugins = pkgs.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.clion); clionPlugins = lib.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.clion);
ideaCommunityPlugins = pkgs.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-community); ideaCommunityPlugins = lib.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-community);
ideaUltimatePlugins = pkgs.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-ultimate); ideaUltimatePlugins = lib.dontRecurseIntoAttrs (jetbrainsPluginsFor pkgs.jetbrains.idea-ultimate);
clionWithPlugins = clionPlugins.jetbrainsWithPlugins; clionWithPlugins = clionPlugins.jetbrainsWithPlugins;
ideaCommunityWithPlugins = ideaCommunityPlugins.jetbrainsWithPlugins; ideaCommunityWithPlugins = ideaCommunityPlugins.jetbrainsWithPlugins;
@@ -25,7 +25,7 @@ rec {
python3Packages = pkgs.python3Packages // python3Packages; python3Packages = pkgs.python3Packages // python3Packages;
}; };
python3Packages = pkgs.recurseIntoAttrs { python3Packages = lib.recurseIntoAttrs {
py-sonic = pkgs.python3.pkgs.callPackage ../development/python-modules/py-sonic { }; py-sonic = pkgs.python3.pkgs.callPackage ../development/python-modules/py-sonic { };
}; };

2
pkgs/top-level/stage.nix
View File

@@ -11,7 +11,7 @@ let
import ./by-name-overlay.nix { inherit pkgs lib; } ../by-name; import ./by-name-overlay.nix { inherit pkgs lib; } ../by-name;
allPackages = _self: _super: allPackages = _self: _super:
import ./all-packages.nix { inherit pkgs; }; import ./all-packages.nix { inherit pkgs lib; };
toFix = (lib.flip lib.composeManyExtensions) (_self: { }) [ toFix = (lib.flip lib.composeManyExtensions) (_self: { }) [
autoCalledPackages autoCalledPackages