From 2121543d0c840aa6d69e117dc424705c1f94b645 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Mar 2015 21:16:47 +0100 Subject: [PATCH] jailbreak-cabal: avoid infinite recursion --- 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 | 2 +- 5 files changed, 5 insertions(+), 5 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 2a5213d4e12..1d783b3ee17 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -56,7 +56,7 @@ self: super: { hashable = dontCheck super.hashable; # Needs Cabal >= 1.18.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; }; + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; }; # Haddock chokes on the prologue from the cabal file. ChasingBottoms = dontHaddock super.ChasingBottoms; 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 27c4b642c4b..4bc7f8d68b6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -49,7 +49,7 @@ self: super: { hashable = dontCheck super.hashable; # Needs Cabal >= 1.18.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; }; + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; }; # Haddock chokes on the prologue from the cabal file. ChasingBottoms = dontHaddock super.ChasingBottoms; 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 8428af7ca6e..335800bd1fe 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -49,7 +49,7 @@ self: super: { hashable = dontCheck super.hashable; # Needs Cabal >= 1.18.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; }; + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; }; # Haddock chokes on the prologue from the cabal file. ChasingBottoms = dontHaddock super.ChasingBottoms; 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 fd4109fad72..02e40bc9d7c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -46,7 +46,7 @@ self: super: { hashable = dontCheck super.hashable; # Needs Cabal >= 1.18.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; }; + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; }; # Haddock chokes on the prologue from the cabal file. ChasingBottoms = dontHaddock super.ChasingBottoms; 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 5285484d2ff..a29b41fa592 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -49,7 +49,7 @@ self: super: { hashable = dontCheck super.hashable; # Needs Cabal >= 1.18.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; }; + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; }; # Haddock chokes on the prologue from the cabal file. ChasingBottoms = dontHaddock super.ChasingBottoms;