diff options
author | Leon Isenberg <leon.isenberg@t-online.de> | 2017-03-05 17:13:27 +0100 |
---|---|---|
committer | Leon Isenberg <leon.isenberg@t-online.de> | 2017-03-08 13:10:28 +0100 |
commit | b9c7d291bc38c41f0c389c8615f42eb9c33ddd23 (patch) | |
tree | b646f535c4cce7474705ece561e43b01159395ac /pkgs/top-level/haskell-packages.nix | |
parent | feab711f84f32ff92978b971585026ed247e3a98 (diff) | |
download | nixlib-b9c7d291bc38c41f0c389c8615f42eb9c33ddd23.tar nixlib-b9c7d291bc38c41f0c389c8615f42eb9c33ddd23.tar.gz nixlib-b9c7d291bc38c41f0c389c8615f42eb9c33ddd23.tar.bz2 nixlib-b9c7d291bc38c41f0c389c8615f42eb9c33ddd23.tar.lz nixlib-b9c7d291bc38c41f0c389c8615f42eb9c33ddd23.tar.xz nixlib-b9c7d291bc38c41f0c389c8615f42eb9c33ddd23.tar.zst nixlib-b9c7d291bc38c41f0c389c8615f42eb9c33ddd23.zip |
haskellPackages: apply GHC specific overrides before GHCJS
GHCJS is effectively a backend for GHC, so all the GHC version specific package set overrides should in general apply to the GHCJS package sets, too.
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b4226e656fde..0cb2ce640504 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -161,11 +161,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 { }; }; # The integer-simple attribute set contains package sets for all the GHC compilers |