From 27e37a11d136ea57b1cb83977d3c0a5ad0ce0980 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 24 Feb 2015 12:09:32 +0100 Subject: [PATCH] haskell-ng: update Cabal to version 1.22.1.1 and binary to version 0.7.4.0 --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 4 ++-- 6 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 35060ac0690..11f9e6945bc 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_0 = dontCheck super.Cabal_1_22_1_0; - cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_1_0; }); + 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; }); # Break infinite recursions. digest = super.digest.override { inherit (pkgs) zlib; }; 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 bc558a7821e..25f6b146f1e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -38,7 +38,7 @@ self: super: { unix = null; # binary is not a core library for this compiler. - binary = self.binary_0_7_3_0; + binary = self.binary_0_7_4_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 dace434fda5..982dd62cd8f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -32,7 +32,7 @@ self: super: { unix = null; # binary is not a core library for this compiler. - binary = self.binary_0_7_3_0; + binary = self.binary_0_7_4_0; # deepseq is not a core library for this compiler. deepseq = self.deepseq_1_4_0_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 dc79fba8407..7ac3f97d1ae 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -40,7 +40,7 @@ self: super: { transformers-compat = disableCabalFlag super.transformers-compat "three"; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_1_0 = super.Cabal_1_22_1_0.override { binary = self.binary_0_7_3_0; process = self.process_1_2_2_0; }; + Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; process = self.process_1_2_2_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 c627d670586..f9228b9013b 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_0 = super.Cabal_1_22_1_0.override { binary = self.binary_0_7_3_0; }; + Cabal_1_22_1_1 = super.Cabal_1_22_1_1.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 9210df486e8..b12d3005013 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_0; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_1_0 = super.Cabal_1_22_1_0.override { binary = self.binary_0_7_3_0; }; + Cabal_1_22_1_1 = super.Cabal_1_22_1_1.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_0 ]; + buildTools = with self; [ alex happy Cabal_1_22_1_1 ]; patchPhase = "sed -i -e 's|process .*,|process,|' cryptol.cabal"; description = "Cryptol: The Language of Cryptography"; license = pkgs.stdenv.lib.licenses.bsd3;