From 1444504e4bcb3adb6b1c6db469469e7801fde1fe Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 26 Feb 2021 14:54:28 +0100 Subject: [PATCH] haskellPackages.cabal-install: Fix build for 3.4.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can‘t use overrideScope with random because that would touch a lot of tests and cause build failures. So I try to do the overrides manually. --- .../configuration-ghc-8.10.x.nix | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 60d3f423246..5e39a8047bd 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -42,20 +42,13 @@ self: super: { unix = null; xhtml = null; - # The proper 3.2.0.0 release does not compile with ghc-8.10.1, so we take the - # hitherto unreleased next version from the '3.2' branch of the upstream git - # repository for the time being. - cabal-install = assert super.cabal-install.version == "3.2.0.0"; - overrideCabal super.cabal-install (drv: { - postUnpack = "sourceRoot+=/cabal-install; echo source root reset to $sourceRoot"; - version = "3.2.0.0-git"; - editedCabalFile = null; - src = pkgs.fetchgit { - url = "git://github.com/haskell/cabal.git"; - rev = "9bd4cc0591616aeae78e17167338371a2542a475"; - sha256 = "005q1shh7vqgykkp72hhmswmrfpz761x0q0jqfnl3wqim4xd9dg0"; - }; - }); + 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; }; + # Usung 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; + }; # Jailbreak to fix the build. base-noprelude = doJailbreak super.base-noprelude;