From 9c3da4e723237a5a581abe1559f6f74ac09c1088 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 22 Feb 2015 13:32:27 +0100 Subject: [PATCH] Cabal: update overrides for version 1.22.1.0 --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 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 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index da59527dff43..f59d38ccd2d9 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_0_0 = dontCheck super.Cabal_1_22_0_0; - cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_0_0; }); + 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; }); # Break infinite recursions. digest = super.digest.override { inherit (pkgs) zlib; }; 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 88e14b5a9e2c..dc79fba84071 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_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; process = self.process_1_2_2_0; }; + 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; }; # 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 a7465f7744d3..c627d6705868 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_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; }; + Cabal_1_22_1_0 = super.Cabal_1_22_1_0.override { binary = self.binary_0_7_3_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 14b6aa161de0..9210df486e84 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_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; }; + Cabal_1_22_1_0 = super.Cabal_1_22_1_0.override { binary = self.binary_0_7_3_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_0_0 ]; + buildTools = with self; [ alex happy Cabal_1_22_1_0 ]; patchPhase = "sed -i -e 's|process .*,|process,|' cryptol.cabal"; description = "Cryptol: The Language of Cryptography"; license = pkgs.stdenv.lib.licenses.bsd3;