From 8737c9668b70a6ced8e8f6d771c9b3f4e401da17 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Dec 2017 13:53:43 +0100 Subject: [PATCH] haskell-Cabal: update overrides for new 2.0.1.1 release --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 84df4d1f0c4..54ac33260a3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -41,7 +41,7 @@ self: super: { # cabal-install needs Cabal 2.x. hackage-security's test suite does not compile with # Cabal 2.x, though. See https://github.com/haskell/hackage-security/issues/188. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_0; }); + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_1; }); hackage-security = dontCheck super.hackage-security; # Link statically to avoid runtime dependency on GHC. diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 51276ce8c89..1c141dfaf75 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -60,6 +60,6 @@ self: super: { apply-refact = super.apply-refact_0_3_0_1; # This builds needs the latest Cabal version. - cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_0; }); + cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_1; }); }