Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

packages-config: refactor and simplification #113713

Merged
merged 1 commit into from
Aug 18, 2021
Merged

packages-config: refactor and simplification #113713

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 28 additions & 33 deletions pkgs/top-level/packages-config.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,32 @@
# Enable recursion into attribute sets that nix-env normally doesn't look into
# so that we can get a more complete picture of the available packages for the
# purposes of the index.
packageOverrides = super:
let
recurseIntoAttrs = sets:
super.lib.genAttrs
(builtins.filter (set: builtins.hasAttr set super) sets)
(set: super.recurseIntoAttrs (builtins.getAttr set super));
in recurseIntoAttrs [
"roundcubePlugins"
"emscriptenfastcompPackages"
"fdbPackages"
"nodePackages_latest"
"nodePackages"
"platformioPackages"
"haskellPackages"
"idrisPackages"
"sconsPackages"
"gns3Packages"
"quicklispPackagesClisp"
"quicklispPackagesSBCL"
"rPackages"
"apacheHttpdPackages_2_4"
"zabbix50"
"zabbix40"
"zabbix30"
"fusePackages"
"nvidiaPackages"
"sourceHanPackages"
"atomPackages"
"emacs27.pkgs"
"steamPackages"
"ut2004Packages"
"zeroadPackages"
];
packageOverrides = super: with super; lib.mapAttrs (_: set: recurseIntoAttrs set) {
inherit (super)
apacheHttpdPackages
atomPackages
Atemu marked this conversation as resolved.
Show resolved Hide resolved
fdbPackages
fusePackages
gns3Packages
haskellPackages
idrisPackages
nodePackages
nodePackages_latest
platformioPackages
quicklispPackagesClisp
quicklispPackagesSBCL
rPackages
roundcubePlugins
sconsPackages
sourceHanPackages
steamPackages
ut2004Packages
zabbix40
zabbix50
zeroadPackages
;

# This is an alias which we disallow by default; explicitly allow it
emacs27Packages = emacs27.pkgs;
};
}