diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index bea914354de0..4ed6d8a957fb 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 bad483f02373..2ca2ff7e75ef 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;