diff options
| author | Peter Simons <simons@cryp.to> | 2017-03-24 23:15:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-24 23:15:41 +0100 |
| commit | 24a69286e9e0b017e7e4d51db0f5b29adc3f7438 (patch) | |
| tree | 042af446e2de05737e9a79ce92aeee204c57f935 /pkgs | |
| parent | 011466857bebfb6aa82e8b8863b5656468e9d3d9 (diff) | |
| parent | b9c7d291bc38c41f0c389c8615f42eb9c33ddd23 (diff) | |
| download | nixpkgs-24a69286e9e0b017e7e4d51db0f5b29adc3f7438.tar nixpkgs-24a69286e9e0b017e7e4d51db0f5b29adc3f7438.tar.gz nixpkgs-24a69286e9e0b017e7e4d51db0f5b29adc3f7438.tar.bz2 nixpkgs-24a69286e9e0b017e7e4d51db0f5b29adc3f7438.tar.lz nixpkgs-24a69286e9e0b017e7e4d51db0f5b29adc3f7438.tar.xz nixpkgs-24a69286e9e0b017e7e4d51db0f5b29adc3f7438.tar.zst nixpkgs-24a69286e9e0b017e7e4d51db0f5b29adc3f7438.zip | |
Merge pull request #23610 from ljli/hs-ghcjs-pkgs-inherit
haskellPackages: apply GHC specific overrides before GHCJS
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghcjs.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index bea914354de..4ed6d8a957f 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -181,8 +181,6 @@ self: super: ] drv.libraryHaskellDepends; }); - semigroups = addBuildDepends super.semigroups [ self.hashable self.unordered-containers self.text self.tagged ]; - transformers-compat = overrideCabal super.transformers-compat (drv: { configureFlags = []; }); diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index bad483f0237..2ca2ff7e75e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -166,11 +166,13 @@ in rec { }; ghcjs = callPackage ../development/haskell-modules { ghc = compiler.ghcjs; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; + packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; ghcjsHEAD = callPackage ../development/haskell-modules { ghc = compiler.ghcjsHEAD; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; + packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; ghcHaLVM240 = callPackage ../development/haskell-modules { ghc = compiler.ghcHaLVM240; |