From 258bc139660f357ba8145db8501c350731edc247 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Mar 2015 13:42:50 +0100
Subject: [PATCH] haskell-ng: update Cabal and deepseq to latest versions
---
pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix | 2 +-
pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix | 4 ++--
pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix | 2 +-
pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ffd2e209999..ef515bda006 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -7,8 +7,8 @@ self: super: {
# Some packages need a non-core version of Cabal.
Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6;
Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3;
- Cabal_1_22_1_1 = dontCheck super.Cabal_1_22_1_1;
- cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_1_1; });
+ Cabal_1_22_2_0 = dontCheck super.Cabal_1_22_2_0;
+ cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_2_0; });
# Break infinite recursions.
digest = super.digest.override { inherit (pkgs) zlib; };
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 36afb31ffcd..4343970bb00 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: {
binary = self.binary_0_7_4_0;
# deepseq is not a core library for this compiler.
- deepseq = self.deepseq_1_4_1_0;
+ deepseq = self.deepseq_1_4_1_1;
# transformers is not a core library for this compiler.
transformers = self.transformers_0_4_3_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 23e939853af..9c03b7e469d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -32,7 +32,7 @@ self: super: {
unix = null;
# deepseq is not a core library for this compiler.
- deepseq = self.deepseq_1_4_1_0;
+ deepseq = self.deepseq_1_4_1_1;
# transformers is not a core library for this compiler.
transformers = self.transformers_0_4_3_0;
@@ -40,7 +40,7 @@ self: super: {
transformers-compat = disableCabalFlag super.transformers-compat "three";
# https://github.com/haskell/cabal/issues/2322
- Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; };
+ Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; };
# https://github.com/tibbe/hashable/issues/85
hashable = dontCheck super.hashable;
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 0188be27a65..383a0318390 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -37,7 +37,7 @@ self: super: {
transformers-compat = disableCabalFlag super.transformers-compat "three";
# https://github.com/haskell/cabal/issues/2322
- Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; };
+ Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { 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 827ea9895e6..b742f69cc81 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -40,7 +40,7 @@ self: super: {
terminfo = self.terminfo_0_4_0_1;
# https://github.com/haskell/cabal/issues/2322
- Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; };
+ Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; };
# https://github.com/tibbe/hashable/issues/85
hashable = dontCheck super.hashable;
@@ -87,7 +87,7 @@ self: super: {
presburger pretty process QuickCheck random smtLib syb text
tf-random transformers utf8-string
];
- buildTools = with self; [ alex happy Cabal_1_22_1_1 ];
+ buildTools = with self; [ alex happy Cabal_1_22_2_0 ];
patchPhase = "sed -i -e 's|process .*,|process,|' cryptol.cabal";
description = "Cryptol: The Language of Cryptography";
license = pkgs.stdenv.lib.licenses.bsd3;