From 124d658eff308e678eee5b3b8a514490c18fbee1 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sat, 7 Aug 2021 16:23:10 +0200
Subject: [PATCH] haskellPackages.{cabal-install, cabal-install-parsers}: use
 Cabal 3.6.0.0

Try using the latest and greatest version Cabal for cabal-install and
cabal-install-parsers, we'll see how it goes.
---
 pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix  | 2 +-
 pkgs/top-level/release-haskell.nix                            | 2 +-
 3 files changed, 4 insertions(+), 4 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 5ef659349b38..ca4b974449a1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -44,12 +44,12 @@ self: super: {
 
   # cabal-install needs more recent versions of Cabal and base16-bytestring.
   cabal-install = super.cabal-install.overrideScope (self: super: {
-    Cabal = self.Cabal_3_4_0_0;
+    Cabal = self.Cabal_3_6_0_0;
     base16-bytestring = self.base16-bytestring_0_1_1_7;
   });
 
   # cabal-install-parsers is written for Cabal 3.4
-  cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_4_0_0; };
+  cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_0_0; };
 
   # Jailbreak to fix the build.
   base-noprelude = doJailbreak super.base-noprelude;
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 7e495474c84f..cfc19f6b35f4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -58,7 +58,7 @@ self: super: {
   # cabal-install needs more recent versions of Cabal and random, but an older
   # version of base16-bytestring.
   cabal-install = super.cabal-install.overrideScope (self: super: {
-    Cabal = self.Cabal_3_4_0_0;
+    Cabal = self.Cabal_3_6_0_0;
     base16-bytestring = self.base16-bytestring_0_1_1_7;
   });
 
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 5173ec6cb361..400635740eae 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -300,7 +300,7 @@ let
       # package sets (like Cabal, jailbreak-cabal) are
       # working as expected.
       cabal-install = all;
-      Cabal_3_4_0_0 = with compilerNames; [ ghc884 ghc8104 ];
+      Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8104 ];
       cabal2nix-unstable = all;
       funcmp = all;
       # Doesn't currently work on ghc-9.0: