diff options
| author | Peter Simons <simons@cryp.to> | 2015-10-16 15:12:27 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-10-18 22:01:09 +0200 |
| commit | 8e07d5d77c7c9b1b7f66afee460ea696228c8a99 (patch) | |
| tree | 8a0309d0aa90b7fda36e6c10ea0ec31e6160d1f1 /pkgs/development/haskell-modules | |
| parent | 215e7a6f006a86040bbf77dca2d355f8e1e4c510 (diff) | |
| download | nixlib-8e07d5d77c7c9b1b7f66afee460ea696228c8a99.tar nixlib-8e07d5d77c7c9b1b7f66afee460ea696228c8a99.tar.gz nixlib-8e07d5d77c7c9b1b7f66afee460ea696228c8a99.tar.bz2 nixlib-8e07d5d77c7c9b1b7f66afee460ea696228c8a99.tar.lz nixlib-8e07d5d77c7c9b1b7f66afee460ea696228c8a99.tar.xz nixlib-8e07d5d77c7c9b1b7f66afee460ea696228c8a99.tar.zst nixlib-8e07d5d77c7c9b1b7f66afee460ea696228c8a99.zip | |
haskell: update lists of core and non-core packages for older compilers
Diffstat (limited to 'pkgs/development/haskell-modules')
4 files changed, 23 insertions, 11 deletions
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 9ce0e9200422..cc5d03f05f5b 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 ae85c4a009c1..b79cdb6da977 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 aa27b70a566e..693c0b1d5224 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 381da0afa3f5..f07a065e176b 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 |