pyrox.dev
packages-config: refactor and simplification
Now simply inherits attrsets from super directly instead of mapping getAttr over
a list of strings.
Filtering isn't really needed as non-existent subsets should just be removed
from this list when removing them from Nixpkgs (such an action warrants a
tree-wide search which should come across this file).
recurseIntoAttrs can simply be mapAttr'd now.
Some subsets have been removed because they no longer exist.
Sorted the list while I was at it.
+28
-33
pkgs/top-level/packages-config.nix
+28
-33
pkgs/top-level/packages-config.nix
···
6
6
# Enable recursion into attribute sets that nix-env normally doesn't look into
7
7
# so that we can get a more complete picture of the available packages for the
8
8
# purposes of the index.
9
-
packageOverrides = super:
10
-
let
11
-
recurseIntoAttrs = sets:
12
-
super.lib.genAttrs
13
-
(builtins.filter (set: builtins.hasAttr set super) sets)
14
-
(set: super.recurseIntoAttrs (builtins.getAttr set super));
15
-
in recurseIntoAttrs [
16
-
"roundcubePlugins"
17
-
"emscriptenfastcompPackages"
18
-
"fdbPackages"
19
-
"nodePackages_latest"
20
-
"nodePackages"
21
-
"platformioPackages"
22
-
"haskellPackages"
23
-
"idrisPackages"
24
-
"sconsPackages"
25
-
"gns3Packages"
26
-
"quicklispPackagesClisp"
27
-
"quicklispPackagesSBCL"
28
-
"rPackages"
29
-
"apacheHttpdPackages_2_4"
30
-
"zabbix50"
31
-
"zabbix40"
32
-
"zabbix30"
33
-
"fusePackages"
34
-
"nvidiaPackages"
35
-
"sourceHanPackages"
36
-
"atomPackages"
37
-
"emacs27.pkgs"
38
-
"steamPackages"
39
-
"ut2004Packages"
40
-
"zeroadPackages"
41
-
];
9
+
packageOverrides = super: with super; lib.mapAttrs (_: set: recurseIntoAttrs set) {
10
+
inherit (super)
11
+
apacheHttpdPackages
12
+
atomPackages
13
+
fdbPackages
14
+
fusePackages
15
+
gns3Packages
16
+
haskellPackages
17
+
idrisPackages
18
+
nodePackages
19
+
nodePackages_latest
20
+
platformioPackages
21
+
quicklispPackagesClisp
22
+
quicklispPackagesSBCL
23
+
rPackages
24
+
roundcubePlugins
25
+
sconsPackages
26
+
sourceHanPackages
27
+
steamPackages
28
+
ut2004Packages
29
+
zabbix40
30
+
zabbix50
31
+
zeroadPackages
32
+
;
33
+
34
+
# This is an alias which we disallow by default; explicitly allow it
35
+
emacs27Packages = emacs27.pkgs;
36
+
};
42
37
}