From f5501e699eaca1f562d0bd794de5c6ef4db5661c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 2 Feb 2026 12:41:34 +0100 Subject: [PATCH] haskellPackages.hookup: ignore revision, so our patch still applies The new revision relaxes the bound on network, but not base, so it doesn't quite help us enough. --- .../haskell-modules/configuration-common.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f51c785410aa..81a147e0d130 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2425,15 +2425,23 @@ with haskellLib; NGLess = dontCheck super.NGLess; # Too strict bound on network (<3.2) - hookup = appendPatches [ - (pkgs.fetchpatch { - name = "hookup-network-3.2.patch"; - url = "https://github.com/glguy/irc-core/commit/a3ec982e729b0f77b2db336ec32c5e4b7283bed5.patch"; - sha256 = "0qc1qszn3l69xlbpfv8vz9ld0q7sghfcbp0wjds81kwcpdpl4jgv"; - stripLen = 1; - includes = [ "hookup.cabal" ]; - }) - ] super.hookup; + hookup = + appendPatches + [ + (pkgs.fetchpatch { + name = "hookup-network-3.2.patch"; + url = "https://github.com/glguy/irc-core/commit/a3ec982e729b0f77b2db336ec32c5e4b7283bed5.patch"; + sha256 = "0qc1qszn3l69xlbpfv8vz9ld0q7sghfcbp0wjds81kwcpdpl4jgv"; + stripLen = 1; + includes = [ "hookup.cabal" ]; + }) + ] + ( + overrideCabal { + revision = null; + editedCabalFile = null; + } super.hookup + ); basic-sop = appendPatch (fetchpatch { # https://github.com/well-typed/basic-sop/pull/13