From fe92ebbaa8314dd735e601586bb61acd993ac165 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 5 Mar 2024 00:16:17 +0100 Subject: haskellPackages.taffybar: add patch for newer scotty versions --- pkgs/development/haskell-modules/configuration-common.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'pkgs/development/haskell-modules') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bfa164b8d70b..fb8c44809f9c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -204,6 +204,16 @@ self: super: { # Too strict bounds on optparse-applicative weeder = lib.warnIf (lib.versionAtLeast super.weeder.version "2.8.0") "jailbreak on weeder may be obsolete" doJailbreak super.weeder; + # Allow scotty < 0.21 + # For < 0.22 add https://github.com/taffybar/taffybar/commit/71fe820d892a85e49ad2f2843eac0a59e01f3fd4 + taffybar = appendPatches [ + (pkgs.fetchpatch { + name = "taffybar-scotty-0.20.patch"; + url = "https://github.com/taffybar/taffybar/commit/dcc4184fa63295d51b6c6efb2f97f23b13170e66.patch"; + sha256 = "0hsn0zxpc8icabdq48jlkfn2v07xfjy4l344fnq2pbdc5apcm0fy"; + }) + ] super.taffybar; + # fix tests failure for baseā‰„4.15 (https://github.com/kim/leveldb-haskell/pull/41) leveldb-haskell = appendPatch (fetchpatch { url = "https://github.com/kim/leveldb-haskell/commit/f5249081f589233890ddb1945ec548ca9fb717cf.patch"; -- cgit 1.4.1