summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2021-03-12 20:34:28 +0100
committerPeter Simons <simons@cryp.to>2021-03-12 20:34:28 +0100
commitde657f6a2a9a08ca6e1e82cd5231feae1eb44677 (patch)
treee14aa3f162c940949c13273fb676224af251c54c
parent47edbe5d3907ffe53c57c7d1d16b11cbf5971c9c (diff)
downloadnixpkgs-de657f6a2a9a08ca6e1e82cd5231feae1eb44677.tar
nixpkgs-de657f6a2a9a08ca6e1e82cd5231feae1eb44677.tar.gz
nixpkgs-de657f6a2a9a08ca6e1e82cd5231feae1eb44677.tar.bz2
nixpkgs-de657f6a2a9a08ca6e1e82cd5231feae1eb44677.tar.lz
nixpkgs-de657f6a2a9a08ca6e1e82cd5231feae1eb44677.tar.xz
nixpkgs-de657f6a2a9a08ca6e1e82cd5231feae1eb44677.tar.zst
nixpkgs-de657f6a2a9a08ca6e1e82cd5231feae1eb44677.zip
cabal-install: fix build with ghc-8.8.x
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix10
1 files 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 e6e0f690fe7..996d2182602 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;