From 46823c161a582d84e686964e6152bc50535076ed Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 7 Apr 2026 12:59:44 +0200 Subject: [PATCH] haskellPackages.pandoc: patch test suite race condition, enable -j --- .../haskell-modules/configuration-common.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bd91bb4c5f9f..1fe11e4b898d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -949,10 +949,6 @@ with haskellLib; ]; pandoc = overrideCabal (drv: { - # Work around test suite race condition(s) due to tasty >= 1.5.4 - # https://github.com/jgm/pandoc/issues/11566 - testFlags = drv.testFlags or [ ] ++ [ "-j1" ]; - patches = drv.patches or [ ] ++ [ # Adjust test fixtures for djot >= 0.1.2.3, patch extracted from unrelated change. (pkgs.fetchpatch { @@ -968,6 +964,13 @@ with haskellLib; hash = "sha256-lpddKGa8xs+Lhi62HhBgV04fUq2kkippA1xX2/b2ukM="; includes = [ "test/Tests/Writers/HTML.hs" ]; }) + # Resolve test suite race condition(s) due to tasty >= 1.5.4 and + # inDirectory, https://github.com/jgm/pandoc/issues/11566 krank:ignore-line + (pkgs.fetchpatch { + name = "pandoc-tests-fix-race-condition.patch"; + url = "https://github.com/jgm/pandoc/commit/134296c54145ef8ea7de523774837055239e0b3d.patch"; + hash = "sha256-s3v6ukoVZm8cvh9mAp0U+cQDT3p8QSu1F0oQD4Ks9F8="; + }) ]; }) super.pandoc;