Skip to content

Instantly share code, notes, and snippets.

@infinisil
Created December 29, 2017 18:04
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save infinisil/5ca4e243fb5d6f1b77b671a8252a19d9 to your computer and use it in GitHub Desktop.
Save infinisil/5ca4e243fb5d6f1b77b671a8252a19d9 to your computer and use it in GitHub Desktop.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 944cdcda8fa..0bce9c17ec5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3140,7 +3140,7 @@ with pkgs;
nodejs = pkgs.nodejs-4_x;
};
- nodePackages = nodePackages_6_x;
+ nodePackages = recurseIntoAttrs nodePackages_6_x;
# Can be used as a user shell
nologin = shadow;
@@ -5933,9 +5933,9 @@ with pkgs;
haskell = callPackage ./haskell-packages.nix { };
- haskellPackages = haskell.packages.ghc822.override {
+ haskellPackages = recurseIntoAttrs (haskell.packages.ghc822.override {
overrides = config.haskellPackageOverrides or (self: super: {});
- };
+ });
inherit (haskellPackages) ghc;
@@ -6781,7 +6781,7 @@ with pkgs;
python36Full = python36.override{x11Support=true;};
# pythonPackages further below, but assigned here because they need to be in sync
- pythonPackages = python.pkgs;
+ pythonPackages = recurseIntoAttrs python.pkgs;
python2Packages = python2.pkgs;
python3Packages = python3.pkgs;
@@ -6809,10 +6809,10 @@ with pkgs;
};
# Python package sets.
- python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs);
+ python27Packages = lib.hiPrioSet python27.pkgs;
python34Packages = python34.pkgs;
python35Packages = python35.pkgs;
- python36Packages = recurseIntoAttrs python36.pkgs;
+ python36Packages = python36.pkgs;
pypyPackages = pypy.pkgs;
# Should eventually be moved inside Python interpreters.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment