diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index 9ce0e920042..cc5d03f05f5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -34,14 +34,14 @@ self: super: { time = null; unix = null; - # binary is not a core library for this compiler. + # These packages are core libraries in GHC 7.10.x, but not here. binary = self.binary_0_7_6_1; - - # deepseq is not a core library for this compiler. - deepseq = self.deepseq_1_4_1_2; - - # transformers is not a core library for this compiler. + deepseq = self.deepseq_1_3_0_1; + haskeline = self.haskeline_0_7_2_1; + hoopl = self.hoopl_3_10_2_0; + terminfo = self.terminfo_0_4_0_1; transformers = self.transformers_0_4_3_0; + xhtml = self.xhtml_3000_2_1; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index ae85c4a009c..b79cdb6da97 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -34,11 +34,12 @@ self: super: { time = null; unix = null; - # deepseq is not a core library for this compiler. - deepseq = self.deepseq_1_4_1_2; - - # transformers is not a core library for this compiler. + # These packages are core libraries in GHC 7.10.x, but not here. + deepseq = self.deepseq_1_3_0_1; + haskeline = self.haskeline_0_7_2_1; + terminfo = self.terminfo_0_4_0_1; transformers = self.transformers_0_4_3_0; + xhtml = self.xhtml_3000_2_1; # https://github.com/haskell/cabal/issues/2322 Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_7_6_1; process = self.process_1_2_3_0; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index aa27b70a566..693c0b1d522 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -34,8 +34,11 @@ self: super: { time = null; unix = null; - # transformers is not a core library for this compiler. + # These packages are core libraries in GHC 7.10.x, but not here. + haskeline = self.haskeline_0_7_2_1; + terminfo = self.terminfo_0_4_0_1; transformers = self.transformers_0_4_3_0; + xhtml = self.xhtml_3000_2_1; # https://github.com/haskell/cabal/issues/2322 Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_7_6_1; }; diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 381da0afa3f..f07a065e176 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -55,6 +55,14 @@ self: super: { unordered-containers = null; vector = null; + # These packages are core libraries in GHC 7.10.x, but not here. + bin-package-db = null; + haskeline = self.haskeline_0_7_2_1; + hoopl = self.hoopl_3_10_2_0; + hpc = self.hpc_0_6_0_2; + terminfo = self.terminfo_0_4_0_1; + xhtml = self.xhtml_3000_2_1; + pqueue = overrideCabal super.pqueue (drv: { postPatch = '' sed -i -e '12s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs