From 604c0fed7ab4ffd5320c10b2e4a767d0a1e5752a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Mar 2023 12:21:28 +0100 Subject: [PATCH] haskellPackages.Cabal_3_8_1_0: apply revision 2 Requested in #218740. --- pkgs/development/haskell-modules/configuration-nix.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 9d633d7a5297..c38cd8ee4968 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1053,12 +1053,15 @@ self: super: builtins.intersectAttrs super { hint = dontCheck super.hint; # Make sure that Cabal 3.8.* can be built as-is - Cabal_3_8_1_0 = doDistribute (super.Cabal_3_8_1_0.override ({ + Cabal_3_8_1_0 = doDistribute (overrideCabal (old: { + revision = assert old.revision == "1"; "2"; + editedCabalFile = "179y365wh9zgzkcn4n6m4vfsfy6vk4apajv8jpys057z3a71s4kp"; + }) (super.Cabal_3_8_1_0.override ({ Cabal-syntax = self.Cabal-syntax_3_8_1_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible process = self.process_1_6_17_0; - })); + }))); # cabal-install switched to build type simple in 3.2.0.0 # as a result, the cabal(1) man page is no longer installed