diff options
| author | Will Fancher <elvishjerricco@gmail.com> | 2017-07-11 22:27:44 -0400 |
|---|---|---|
| committer | Will Fancher <elvishjerricco@gmail.com> | 2017-07-12 18:36:18 -0400 |
| commit | e11dbc37103687fb0c57dce85209086b0d691a34 (patch) | |
| tree | 24a9eebddd7a24bdeb2b603aa79d48f012f14e70 /pkgs/development/haskell-modules/default.nix | |
| parent | af479c182ff0391aefd070f5219e79d15d655c75 (diff) | |
| download | nixpkgs-e11dbc37103687fb0c57dce85209086b0d691a34.tar nixpkgs-e11dbc37103687fb0c57dce85209086b0d691a34.tar.gz nixpkgs-e11dbc37103687fb0c57dce85209086b0d691a34.tar.bz2 nixpkgs-e11dbc37103687fb0c57dce85209086b0d691a34.tar.lz nixpkgs-e11dbc37103687fb0c57dce85209086b0d691a34.tar.xz nixpkgs-e11dbc37103687fb0c57dce85209086b0d691a34.tar.zst nixpkgs-e11dbc37103687fb0c57dce85209086b0d691a34.zip | |
Update `haskellPackages` to use new features of `makeOverridable`
Instead of manually using `makeExtensible`, which broke `override`. Fixes #26561
Diffstat (limited to 'pkgs/development/haskell-modules/default.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/default.nix | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 32fa46f111d..d68b10b386e 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -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 |