Update haskellPackages to use new features of makeOverridable

Instead of manually using `makeExtensible`, which broke `override`.

Fixes #26561
This commit is contained in:
Will Fancher
2017-07-12 18:36:18 -04:00
parent af479c182f
commit e11dbc3710
3 changed files with 30 additions and 34 deletions
+9 -11
View File
@@ -7,6 +7,8 @@
, configurationNix ? import ./configuration-nix.nix
}:
self: # Provided by `callPackageWithSelf`
let
inherit (stdenv.lib) extends makeExtensible;
@@ -14,19 +16,15 @@ let
haskellPackages = makePackageSet {
package-set = initialPackages;
inherit ghc extensible-self;
extensible-self = self;
inherit ghc;
};
commonConfiguration = configurationCommon { inherit pkgs; };
nixConfiguration = configurationNix { inherit pkgs; };
extensible-self = makeExtensible
(extends overrides
(extends packageSetConfig
(extends compilerConfig
(extends commonConfiguration
(extends nixConfiguration haskellPackages)))));
in
extensible-self
in (extends overrides
(extends packageSetConfig
(extends compilerConfig
(extends commonConfiguration
(extends nixConfiguration haskellPackages))))) self