From e25b42d852f950b5c54e9b0e6de91c23f3263fa7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 23 May 2015 13:05:07 +0200 Subject: [PATCH] cabal-install: avoid inconsistent 'binary' versions on ghc-7.4.x and ghc-7.6.x --- pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 3 +++ 2 files changed, 6 insertions(+) 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 88fa300e2e7..2bad8d8b97d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -40,6 +40,9 @@ self: super: { # 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; }; + # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. + cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_4_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 2ee40105439..a90c5f99173 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -42,6 +42,9 @@ self: super: { # 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; }; + # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. + cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_4_0; }); + # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable;