Skip to content

some recurseIntoAttrs hackery #45841

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

Closed
oxij wants to merge 4 commits into from
Closed

some recurseIntoAttrs hackery #45841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d0c7d7
all-packages.nix: introduce and use `dontRecurseIntoAttrs`
oxij Aug 18, 2018
01382b3
all-packages.nix: recurse into all small package subsets
oxij Aug 18, 2018
123362f
all-packages.nix: introduce and use `recurseIntoAttrsMaybe`
oxij Aug 18, 2018
0dac30c
metrics.nix: add a metrick for the current number of packages as seen…
oxij Aug 18, 2018
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
85 changes: 47 additions & 38 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,14 @@ with pkgs;
# inside the set for derivations.
recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; };

# Similarly to the above, but optional.
recurseIntoAttrsMaybe = name: let
allow = e: lib.elem e (config.recurseIntoAttrs or []);
in if allow "all" || allow name then recurseIntoAttrs else (attrs: attrs);

# for documentation purposes
dontRecurseIntoAttrs = x: x;

stringsWithDeps = lib.stringsWithDeps;

### Evaluating the entire Nixpkgs naively will fail, make failure fast
Expand Down Expand Up @@ -2307,7 +2315,7 @@ with pkgs;

emscripten = callPackage ../development/compilers/emscripten { };

emscriptenfastcompPackages = callPackage ../development/compilers/emscripten/fastcomp { };
emscriptenfastcompPackages = recurseIntoAttrs (callPackage ../development/compilers/emscripten/fastcomp { });

emscriptenfastcomp = emscriptenfastcompPackages.emscriptenfastcomp;

Expand Down Expand Up @@ -2627,9 +2635,9 @@ with pkgs;

fuseiso = callPackage ../tools/filesystems/fuseiso { };

fdbPackages = callPackage ../servers/foundationdb {
fdbPackages = recurseIntoAttrs (callPackage ../servers/foundationdb {
stdenv49 = overrideCC stdenv gcc49;
};
});

inherit (fdbPackages)
foundationdb51
Expand Down Expand Up @@ -3687,19 +3695,19 @@ with pkgs;
openssl = openssl_1_1_0;
};

nodePackages_10_x = callPackage ../development/node-packages/default-v10.nix {
nodePackages_10_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v10.nix {
nodejs = pkgs.nodejs-10_x;
};
});

nodePackages_8_x = callPackage ../development/node-packages/default-v8.nix {
nodePackages_8_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v8.nix {
nodejs = pkgs.nodejs-8_x;
};
});

nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix {
nodePackages_6_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v6.nix {
nodejs = pkgs.nodejs-6_x;
};
});

nodePackages = nodePackages_8_x;
nodePackages = recurseIntoAttrsMaybe "nodePackages" nodePackages_8_x;

npm2nix = nodePackages.npm2nix;

Expand Down Expand Up @@ -4671,7 +4679,7 @@ with pkgs;

plan9port = callPackage ../tools/system/plan9port { };

platformioPackages = callPackage ../development/arduino/platformio { };
platformioPackages = recurseIntoAttrs (callPackage ../development/arduino/platformio { });
platformio = platformioPackages.platformio-chrootenv;

platinum-searcher = callPackage ../tools/text/platinum-searcher { };
Expand Down Expand Up @@ -6704,9 +6712,9 @@ with pkgs;

haskell = callPackage ./haskell-packages.nix { };

haskellPackages = haskell.packages.ghc843.override {
haskellPackages = recurseIntoAttrsMaybe "haskellPackages" (haskell.packages.ghc843.override {
overrides = config.haskellPackageOverrides or haskell.packageOverrides;
};
});

inherit (haskellPackages) ghc;

Expand Down Expand Up @@ -6794,9 +6802,9 @@ with pkgs;

icedtea_web = icedtea8_web;

idrisPackages = callPackage ../development/idris-modules {
idrisPackages = recurseIntoAttrs (callPackage ../development/idris-modules {
idris-no-deps = haskellPackages.idris;
};
});

idris = idrisPackages.with-packages [ idrisPackages.base ] ;

Expand Down Expand Up @@ -8654,7 +8662,7 @@ with pkgs;

selendroid = callPackage ../development/tools/selenium/selendroid { };

sconsPackages = callPackage ../development/tools/build-managers/scons { };
sconsPackages = recurseIntoAttrs (callPackage ../development/tools/build-managers/scons { });
scons = sconsPackages.scons_3_0_1;
scons_2_5_1 = sconsPackages.scons_2_5_1;

Expand Down Expand Up @@ -9596,7 +9604,7 @@ with pkgs;
# A GMP fork
mpir = callPackage ../development/libraries/mpir {};

gns3Packages = callPackage ../applications/networking/gns3 { };
gns3Packages = recurseIntoAttrs (callPackage ../applications/networking/gns3 { });
gns3-gui = gns3Packages.guiStable;
gns3-server = gns3Packages.serverStable;

Expand Down Expand Up @@ -12760,9 +12768,9 @@ with pkgs;
quicklispPackagesFor = clwrapper: callPackage ../development/lisp-modules/quicklisp-to-nix.nix {
inherit clwrapper;
};
quicklispPackagesClisp = quicklispPackagesFor (wrapLisp clisp);
quicklispPackagesSBCL = quicklispPackagesFor (wrapLisp sbcl);
quicklispPackages = quicklispPackagesSBCL;
quicklispPackagesClisp = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp clisp));
quicklispPackagesSBCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp sbcl));
quicklispPackages = recurseIntoAttrsMaybe "quicklispPackages" quicklispPackagesSBCL;
quicklispPackages_asdf_3_1 = quicklispPackagesFor
((wrapLisp sbcl).override { asdf = asdf_3_1; });

Expand Down Expand Up @@ -12833,9 +12841,9 @@ with pkgs;
packages = [];
};

rPackages = callPackage ../development/r-modules {
rPackages = recurseIntoAttrsMaybe "rPackages" (callPackage ../development/r-modules {
overrides = (config.rPackageOverrides or (p: {})) pkgs;
};
});

### SERVERS

Expand Down Expand Up @@ -12870,7 +12878,7 @@ with pkgs;
subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; };
};

apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4;
apacheHttpdPackages_2_4 = recurseIntoAttrs (apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4);
apacheHttpdPackages = apacheHttpdPackages_2_4;

appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };
Expand Down Expand Up @@ -13804,9 +13812,9 @@ with pkgs;
inherit (linuxPackages) kernel;
};

fusePackages = callPackage ../os-specific/linux/fuse {
fusePackages = recurseIntoAttrs (callPackage ../os-specific/linux/fuse {
utillinux = utillinuxMinimal;
};
});
fuse = lowPrio fusePackages.fuse_2;
fuse3 = fusePackages.fuse_3;
fuse-common = hiPrio fusePackages.fuse_3.common;
Expand Down Expand Up @@ -14143,7 +14151,7 @@ with pkgs;

nvidiabl = callPackage ../os-specific/linux/nvidiabl { };

nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { };
nvidiaPackages = recurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { });

nvidia_x11_legacy304 = nvidiaPackages.legacy_304;
nvidia_x11_legacy340 = nvidiaPackages.legacy_340;
Expand Down Expand Up @@ -15222,12 +15230,12 @@ with pkgs;

source-han-code-jp = callPackage ../data/fonts/source-han-code-jp { };

sourceHanSansPackages = callPackage ../data/fonts/source-han-sans { };
sourceHanSansPackages = recurseIntoAttrs (callPackage ../data/fonts/source-han-sans { });
source-han-sans-japanese = sourceHanSansPackages.japanese;
source-han-sans-korean = sourceHanSansPackages.korean;
source-han-sans-simplified-chinese = sourceHanSansPackages.simplified-chinese;
source-han-sans-traditional-chinese = sourceHanSansPackages.traditional-chinese;
sourceHanSerifPackages = callPackage ../data/fonts/source-han-serif { };
sourceHanSerifPackages = recurseIntoAttrs (callPackage ../data/fonts/source-han-serif { });
source-han-serif-japanese = sourceHanSerifPackages.japanese;
source-han-serif-korean = sourceHanSerifPackages.korean;
source-han-serif-simplified-chinese = sourceHanSerifPackages.simplified-chinese;
Expand Down Expand Up @@ -15424,7 +15432,7 @@ with pkgs;
gconf = gnome2.GConf;
};

atomPackages = callPackage ../applications/editors/atom { };
atomPackages = recurseIntoAttrs (callPackage ../applications/editors/atom { });

inherit (atomPackages) atom atom-beta;

Expand Down Expand Up @@ -16186,8 +16194,8 @@ with pkgs;
cask = callPackage ../applications/editors/emacs-modes/cask { };
};

emacs25Packages = emacsPackagesFor emacs25 pkgs.emacs25Packages;
emacs26Packages = emacsPackagesFor emacs26 pkgs.emacs26Packages;
emacs25Packages = recurseIntoAttrsMaybe "emacsPackages" (emacsPackagesFor emacs25 pkgs.emacs25Packages);
emacs26Packages = recurseIntoAttrsMaybe "emacsPackages" (emacsPackagesFor emacs26 pkgs.emacs26Packages);

emacsPackagesNgFor = emacs: import ./emacs-packages.nix {
inherit lib newScope stdenv;
Expand All @@ -16211,9 +16219,10 @@ with pkgs;
};
};

emacs25PackagesNg = emacsPackagesNgFor emacs25;
emacs25PackagesNg = recurseIntoAttrsMaybe "emacsPackages" (emacsPackagesNgFor emacs25);
emacs26PackagesNg = recurseIntoAttrsMaybe "emacsPackages" (emacsPackagesNgFor emacs26);

emacs25WithPackages = emacs25PackagesNg.emacsWithPackages;
emacs26PackagesNg = emacsPackagesNgFor emacs26;
emacs26WithPackages = emacs26PackagesNg.emacsWithPackages;
emacsWithPackages = emacsPackagesNg.emacsWithPackages;

Expand Down Expand Up @@ -18783,7 +18792,7 @@ with pkgs;

taskserver = callPackage ../servers/misc/taskserver { };

tdesktopPackages = callPackage ../applications/networking/instant-messengers/telegram/tdesktop { };
tdesktopPackages = recurseIntoAttrs (callPackage ../applications/networking/instant-messengers/telegram/tdesktop { });
tdesktop = tdesktopPackages.stable;

telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { };
Expand Down Expand Up @@ -20202,7 +20211,7 @@ with pkgs;

stockfish = callPackage ../games/stockfish { };

steamPackages = callPackage ../games/steam { };
steamPackages = recurseIntoAttrs (callPackage ../games/steam { });

steam = steamPackages.steam-chrootenv.override {
# DEPRECATED
Expand Down Expand Up @@ -20304,7 +20313,7 @@ with pkgs;

ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { });

ut2004Packages = callPackage ../games/ut2004 { };
ut2004Packages = recurseIntoAttrs (callPackage ../games/ut2004 { });

ut2004demo = self.ut2004Packages.ut2004 [ self.ut2004Packages.ut2004-demo ];

Expand Down Expand Up @@ -20413,9 +20422,9 @@ with pkgs;

keen4 = callPackage ../games/keen4 { };

zeroadPackages = callPackage ../games/0ad {
zeroadPackages = recurseIntoAttrs (callPackage ../games/0ad {
wxGTK = wxGTK30;
};
});

zeroad = zeroadPackages.zeroad;

Expand Down
3 changes: 3 additions & 0 deletions pkgs/top-level/metrics.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ runCommand "nixpkgs-metrics"
run nix-env.qa nix-env -f ${nixpkgs} -qa
run nix-env.qaDrv nix-env -f ${nixpkgs} -qa --drv-path --meta --xml

num=$(nix-env -f ${nixpkgs} -qa --drv-path --meta --xml | grep '<item ' | wc -l)
echo "nix-env.qaDrv.number $num" >> $out/nix-support/hydra-metrics

export GC_INITIAL_HEAP_SIZE=128k
run nix-env.qaAggressive nix-env -f ${nixpkgs} -qa
run nix-env.qaDrvAggressive nix-env -f ${nixpkgs} -qa --drv-path --meta --xml
Expand Down