From ed65e11bac2fde631de8b76a5dddef8aabef2761 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Mar 2023 18:40:23 +0100 Subject: [PATCH] haskellPackages.Cabal_3_8_1_0: drop obsolete override Revision 2 has been applied after the last hackage update. --- pkgs/development/haskell-modules/configuration-nix.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c38cd8ee4968..9d633d7a5297 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1053,15 +1053,12 @@ 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 (overrideCabal (old: { - revision = assert old.revision == "1"; "2"; - editedCabalFile = "179y365wh9zgzkcn4n6m4vfsfy6vk4apajv8jpys057z3a71s4kp"; - }) (super.Cabal_3_8_1_0.override ({ + Cabal_3_8_1_0 = doDistribute (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