From cd9f96a6adbe43a9ccdfc8c22cf22fc0d6fb0960 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 14 Sep 2025 00:46:06 +0200 Subject: [PATCH] diagrams-builder: disable cairo backend (incompatible with Stackage LTS) --- .../haskell-modules/configuration-common.nix | 11 +++++++++++ pkgs/tools/graphics/diagrams-builder/default.nix | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7d9445381471..3ec55b5c2df3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3289,6 +3289,17 @@ with haskellLib; # 2025-04-23: missing test data llvm-pretty-bc-parser = dontCheck super.llvm-pretty-bc-parser; + # diagrams-builder wants diagrams-cairo < 1.5 for its cairo executable, + # but Stackage LTS 24 contains diagrams-cairo >= 1.5. + # As such it is difficult to provide (2025-09-13) + # ATTN: This needs to match ../../tools/graphics/diagrams-builder/default.nix:/backends + # TODO: can we reinstate this by manually passing an older version? + diagrams-builder = disableCabalFlag "cairo" ( + super.diagrams-builder.override { + diagrams-cairo = null; + } + ); + # 2025-04-23: Allow bytestring >= 0.12 # https://github.com/mrkkrp/wave/issues/48 wave = doJailbreak super.wave; diff --git a/pkgs/tools/graphics/diagrams-builder/default.nix b/pkgs/tools/graphics/diagrams-builder/default.nix index 89d8bfbfde45..e7435f5ebd36 100644 --- a/pkgs/tools/graphics/diagrams-builder/default.nix +++ b/pkgs/tools/graphics/diagrams-builder/default.nix @@ -34,8 +34,9 @@ let backends = [ "svg" - "cairo" "ps" + # See ../../../development/haskell-modules/configuration-common.nix:/diagrams-builder.= + # "cairo" ]; in