diff options
| author | Will Fancher <elvishjerricco@gmail.com> | 2017-08-26 11:39:13 -0400 |
|---|---|---|
| committer | Will Fancher <elvishjerricco@gmail.com> | 2017-08-26 11:39:13 -0400 |
| commit | 4d860389d88d35a702f79c0567cb4c6b1ec0deda (patch) | |
| tree | 55ab20bfaf5e227ec2ff09317fcf74a11289c8bf /pkgs/development/haskell-modules/default.nix | |
| parent | 05f9db601abd582be51f096affbb97eff49f2ccb (diff) | |
| parent | 58dc4a85691343a200c1c4495c1bd839b84c2824 (diff) | |
Merge branch 'master' into improved-make-overridable
Diffstat (limited to 'pkgs/development/haskell-modules/default.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 9a67adf57aca6..9eeae0eddc76c 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, ghc, all-cabal-hashes +{ pkgs, stdenv, lib, haskellLib, ghc, all-cabal-hashes , compilerConfig ? (self: super: {}) , packageSetConfig ? (self: super: {}) , overrides ? (self: super: {}) @@ -11,17 +11,17 @@ self: # Provided by `callPackageWithOutput` let - inherit (stdenv.lib) extends makeExtensible; - inherit (import ./lib.nix { inherit pkgs; }) overrideCabal makePackageSet; + inherit (lib) extends makeExtensible; + inherit (haskellLib) overrideCabal makePackageSet; - haskellPackages = makePackageSet { + haskellPackages = pkgs.callPackage makePackageSet { package-set = initialPackages; extensible-self = self; - inherit ghc; + inherit stdenv haskellLib ghc; }; - commonConfiguration = configurationCommon { inherit pkgs; }; - nixConfiguration = configurationNix { inherit pkgs; }; + commonConfiguration = configurationCommon { inherit pkgs haskellLib; }; + nixConfiguration = configurationNix { inherit pkgs haskellLib; }; in (extends overrides (extends packageSetConfig |