From de657f6a2a9a08ca6e1e82cd5231feae1eb44677 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Mar 2021 20:34:28 +0100 Subject: [PATCH] cabal-install: fix build with ghc-8.8.x --- .../haskell-modules/configuration-ghc-8.8.x.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index e6e0f690fe79..996d21826021 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -52,9 +52,15 @@ self: super: { haddock = self.haddock_2_23_1; haddock-api = self.haddock-api_2_23_1; - # These builds need Cabal 3.2.x. + # These builds need newer versions of Cabal. cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_1_0; }; - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; }); + cabal-install = super.cabal-install.override { + Cabal = super.Cabal_3_4_0_0; + hackage-security = super.hackage-security.override { Cabal = super.Cabal_3_4_0_0; }; + # Using dontCheck to break test dependency cycles + edit-distance = dontCheck (super.edit-distance.override { random = super.random_1_2_0; }); + random = super.random_1_2_0; + }; # Ignore overly restrictive upper version bounds. aeson-diff = doJailbreak super.aeson-diff;