haskell.packages.ghc921.cabal-install: fix build

+7 -2
+7 -2
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
··· 67 postPatch = "sed -i -e 's,<4.16,<4.17,' basement.cabal"; 68 }); 69 70 # Duplicate Show instances in tests and library cause compiling tests to fail 71 blaze-builder = appendPatch (dontCheck super.blaze-builder) (pkgs.fetchpatch { 72 url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/blaze-builder-0.4.2.1.patch"; ··· 91 sha256 = "1g48lrmqgd88hqvfq3klz7lsrpwrir2v1931myrhh6dy0d9pqj09"; 92 }); 93 94 - # cabal-install needs more recent versions of Cabal and base16-bytestring. 95 cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { 96 - Cabal = null; 97 }); 98 99 doctest = appendPatch (dontCheck (doJailbreak super.doctest_0_18_1)) (pkgs.fetchpatch {
··· 67 postPatch = "sed -i -e 's,<4.16,<4.17,' basement.cabal"; 68 }); 69 70 + base16-bytestring = appendPatch super.base16-bytestring (pkgs.fetchpatch { 71 + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/base16-bytestring-1.0.1.0.patch"; 72 + sha256 = "19ajai9y04981zfpcdj1nlz44b12gjj4m1ncciijv43mnz82plji"; 73 + }); 74 + 75 # Duplicate Show instances in tests and library cause compiling tests to fail 76 blaze-builder = appendPatch (dontCheck super.blaze-builder) (pkgs.fetchpatch { 77 url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/blaze-builder-0.4.2.1.patch"; ··· 96 sha256 = "1g48lrmqgd88hqvfq3klz7lsrpwrir2v1931myrhh6dy0d9pqj09"; 97 }); 98 99 + # cabal-install needs more recent versions of Cabal 100 cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { 101 + Cabal = self.Cabal_3_6_2_0; 102 }); 103 104 doctest = appendPatch (dontCheck (doJailbreak super.doctest_0_18_1)) (pkgs.fetchpatch {