From 1e14698a5828a09e8b2b3195e537dfcee3f4d3f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 8 Dec 2016 11:51:30 +0100 Subject: [PATCH] haskell-Cabal: update latest version to 1.24.2.0 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f07d6628e4b..1198b60101d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -10,7 +10,7 @@ self: super: { ghcjs-base = null; # Some packages need a non-core version of Cabal. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_1_0; }); + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_2_0; }); # Link statically to avoid runtime dependency on GHC. jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = self.Cabal_1_20_0_4; }; 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 9710d139f8a..564ce3c04ec 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -37,10 +37,10 @@ self: super: { xhtml = null; # Enable latest version of cabal-install. - cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_1_0; }); + cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_2_0; }); # Build jailbreak-cabal with the latest version of Cabal. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_1_0; }; + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; }; Extra = appendPatch super.Extra (pkgs.fetchpatch { url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch";