From 3c3f84b6375082a7f7ff6ea09c50a66469f6e5b9 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 19 Mar 2021 00:51:55 +0100 Subject: [PATCH] haskellPackages.chatter: unbreak chatter's latest hackage release still depends on regex-tdfa-text, but we can apply a patch from master to remove that dependency and jailbreak to relax the bounds on cereal. Both these issues are already resolved on master, so the override should only stand until the next release comes around. Additionally the test suite needs disabling as it doesn't list all required modules in other-modules and thus fails to compile. The issue has been reported upstream. haskellPackages.fullstop: unbreak Unfortunately fullstop is practically unmaintained and has no issue tracker. The build failure is fortunately only affecting the test suite, so a dontCheck resolves the issue for now. --- .../haskell-modules/configuration-common.nix | 15 +++++++++++++++ .../configuration-hackage2nix.yaml | 2 -- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 04d62f2be6dc..28d4e8d0e738 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1649,4 +1649,19 @@ self: super: { '' + (old.postInstall or ""); }); + # Patch and jailbreak can be removed at next release, chatter > 0.9.1.0 + # * Remove dependency on regex-tdfa-text + # * Jailbreak as bounds on cereal are too strict + # * Disable test suite which doesn't compile + # https://github.com/creswick/chatter/issues/38 + chatter = appendPatch + (dontCheck (doJailbreak (super.chatter.override { regex-tdfa-text = null; }))) + (pkgs.fetchpatch { + url = "https://github.com/creswick/chatter/commit/e8c15a848130d7d27b8eb5e73e8a0db1366b2e62.patch"; + sha256 = "1dzak8d12h54vss5fxnrclygz0fz9ygbqvxd5aifz5n3vrwwpj3g"; + }); + + # test suite doesn't compile anymore due to changed hunit/tasty APIs + fullstop = dontCheck super.fullstop; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c319c34ae10d..285e03402036 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -4014,7 +4014,6 @@ broken-packages: - Chart-tests - chart-unit - charter - - chatter - chatty-text - chatwork - cheapskate-terminal @@ -5452,7 +5451,6 @@ broken-packages: - ftree - ftshell - full-sessions - - fullstop - funbot - funbot-client - funbot-git-hook