From 6af0f57f91f5b87e10186f7d26a345cab565478c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 Jul 2016 10:00:50 +0200
Subject: [PATCH] haskell-binary: update to latest version
---
pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix | 2 +-
pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix | 2 +-
pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix | 4 ++--
pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
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 b4ea8fd95b9b..7707733a930a 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;
# These packages are core libraries in GHC 7.10.x, but not here.
- binary = self.binary_0_8_4_0;
+ binary = self.binary_0_8_4_1;
deepseq = self.deepseq_1_3_0_1;
haskeline = self.haskeline_0_7_2_1;
hoopl = self.hoopl_3_10_2_0;
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 2507f9d6aed7..740035f0bb68 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -42,7 +42,7 @@ self: super: {
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_8_4_0; process = self.process_1_2_3_0; };
+ Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_4_1; process = self.process_1_2_3_0; };
# Newer versions don't compile.
Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
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 980f4159bc10..aca043e240ba 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -41,10 +41,10 @@ self: super: {
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_8_4_0; };
+ Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_4_1; };
# Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
- cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_4_0; });
+ cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_4_1; });
# 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 b48f9cfd33cb..39652da5a5d2 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_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_4_0; };
+ Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_4_1; };
# Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
- cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_4_0; });
+ cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_4_1; });
# https://github.com/tibbe/hashable/issues/85
hashable = dontCheck super.hashable;