diff options
7 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a54ffc72a50..715a6da5636 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -809,9 +809,6 @@ self: super: { # https://github.com/yaccz/saturnin/issues/3 Saturnin = dontCheck super.Saturnin; - # https://github.com/kolmodin/binary/issues/74 - binary_0_7_4_0 = dontCheck super.binary_0_7_4_0; - # https://github.com/kkardzis/curlhs/issues/6 curlhs = dontCheck super.curlhs; diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix index 2fecaa5a532..5299cefdc07 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -41,7 +41,7 @@ self: super: { unix = null; # binary is not a core library for this compiler. - binary = self.binary_0_7_4_0; + binary = self.binary_0_7_5_0; # deepseq is not a core library for this compiler. deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1; 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 f6b2b2304b9..a3ad255aab8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -35,7 +35,7 @@ self: super: { unix = null; # binary is not a core library for this compiler. - binary = self.binary_0_7_4_0; + binary = self.binary_0_7_5_0; # deepseq is not a core library for this compiler. deepseq = self.deepseq_1_4_1_1; 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 98bad4fa1be..556b86f95eb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -41,7 +41,7 @@ self: super: { transformers = self.transformers_0_4_3_0; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; }; + Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_5_0; process = self.process_1_2_3_0; }; # Newer versions don't compile. Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6; 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 2bad8d8b97d..d659406818c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -38,10 +38,10 @@ self: super: { transformers = self.transformers_0_4_3_0; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; }; + Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_5_0; }; # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_4_0; }); + cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_5_0; }); # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index a90c5f99173..b7129efb8a7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -40,10 +40,10 @@ self: super: { xhtml = self.xhtml_3000_2_1; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; }; + Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_5_0; }; # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_4_0; }); + cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_5_0; }); # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 84994bc683f..9327af856e8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -86,8 +86,8 @@ self: super: { seqid-streams = super.seqid-streams_0_1_0; # Need binary >= 0.7.2, but our compiler has only 0.7.1.0. - hosc = super.hosc.overrideScope (self: super: { binary = self.binary_0_7_4_0; }); - tidal-midi = super.tidal-midi.overrideScope (self: super: { binary = self.binary_0_7_4_0; }); + hosc = super.hosc.overrideScope (self: super: { binary = self.binary_0_7_5_0; }); + tidal-midi = super.tidal-midi.overrideScope (self: super: { binary = self.binary_0_7_5_0; }); # These packages need mtl 2.2.x directly or indirectly via dependencies. amazonka = markBroken super.amazonka; |