From 4dba3fa2e03bd277b4e2b09814d545d287414cfe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 May 2015 11:18:44 +0200 Subject: [PATCH] Fix bogus references to cabal-install 1.18.x. --- pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix | 4 ++-- 4 files changed, 7 insertions(+), 7 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 40661c69cbd..2fecaa5a532 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -54,8 +54,8 @@ self: super: { Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6; # We have no working cabal-install at the moment. - cabal-install_1_18_0_8 = markBroken super.cabal-install_1_18_0_8; - cabal-install = self.cabal-install_1_18_0_8; + cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0; + cabal-install = self.cabal-install_1_18_1_0; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; 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 ea21f009071..4686c813b3c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -48,8 +48,8 @@ self: super: { # Newer versions don't compile. Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6; - cabal-install_1_18_0_8 = super.cabal-install_1_18_0_8.override { Cabal = self.Cabal_1_18_1_6; }; - cabal-install = self.cabal-install_1_18_0_8; + cabal-install_1_18_1_0 = super.cabal-install_1_18_1_0.override { Cabal = self.Cabal_1_18_1_6; }; + cabal-install = self.cabal-install_1_18_1_0; # Needs Cabal >= 1.18.x. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index d81a5ef6a1b..b4f06964326 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -314,7 +314,7 @@ self: super: { annotated-wl-pprint_0_5_3 = markBroken super.annotated-wl-pprint_0_5_3; c2hs_0_20_1 = markBroken super.c2hs_0_20_1; Cabal_1_20_0_3 = markBroken super.Cabal_1_20_0_3; - cabal-install_1_18_0_8 = markBroken super.cabal-install_1_18_0_8; + cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0; containers_0_4_2_1 = markBroken super.containers_0_4_2_1; control-monad-free_0_5_3 = markBroken super.control-monad-free_0_5_3; equivalence_0_2_5 = markBroken super.equivalence_0_2_5; 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 b06a9dbbbd3..46a4b0d02e6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -45,8 +45,8 @@ self: super: { # Newer versions don't compile. Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6; - cabal-install_1_18_0_8 = super.cabal-install_1_18_0_8.override { Cabal = self.Cabal_1_18_1_6; }; - cabal-install = self.cabal-install_1_18_0_8; + cabal-install_1_18_1_0 = super.cabal-install_1_18_1_0.override { Cabal = self.Cabal_1_18_1_6; }; + cabal-install = self.cabal-install_1_18_1_0; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable;