From eb0717565cf096353a978b511eae04e1f2237727 Mon Sep 17 00:00:00 2001 From: Ai-Ya-Ya Date: Tue, 6 Jan 2026 16:20:26 +0000 Subject: [PATCH] haskellPackages.reanimate-svg: unbreak see https://github.com/reanimate/reanimate-svg/pull/48 for more details --- .../haskell-modules/configuration-common.nix | 47 +++++++++++++++++++ .../configuration-hackage2nix/broken.yaml | 1 - .../transitive-broken.yaml | 2 - .../haskell-modules/configuration-nix.nix | 9 ++++ .../haskell-modules/hackage-packages.nix | 4 -- 5 files changed, 56 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c487be42f071..f31006a543f8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2519,6 +2519,53 @@ with haskellLib; doJailbreak ]; + # 2026-01-06: unbreak and modernize to GHC 9.10.3 + reanimate-svg = overrideCabal (drv: { + # patching doesn't actually move files, need to do manually + prePatch = '' + # Move tests marked good due to previous librsvg failures + for f in \ + animate-elem-32-t.svg \ + fonts-desc-02-t.svg \ + shapes-ellipse-02-t.svg \ + shapes-intro-01-t.svg \ + styling-css-06-b.svg \ + text-intro-05-t.svg \ + ; do + mv test/good/$f test/bad/$f + done + + # Move tests previously marked bad but now fixed from new changes + for f in \ + filters-displace-02-f.svg \ + filters-gauss-01-b.svg \ + masking-mask-01-b.svg \ + painting-render-01-b.svg \ + pservers-grad-04-b.svg \ + pservers-grad-05-b.svg \ + pservers-grad-07-b.svg \ + pservers-grad-08-b.svg \ + pservers-grad-09-b.svg \ + pservers-grad-10-b.svg \ + pservers-grad-11-b.svg \ + pservers-grad-12-b.svg \ + pservers-grad-14-b.svg \ + pservers-grad-15-b.svg \ + pservers-grad-16-b.svg \ + pservers-grad-22-b.svg \ + ; do + mv test/bad/$f test/good/$f + done + ''; + patches = (drv.patches or [ ]) ++ [ + (pkgs.fetchpatch2 { + name = "modernize-to-ghc-9.10.3-and-regress-tests-wrt-librsvg"; + url = "https://github.com/reanimate/reanimate-svg/commit/3f2fab8eb08b7f35b03f5fa17819e43e3879ea80.patch"; + sha256 = "sha256-Em10QyAAiIwHId3CZuByKJ4Fv9W6MII4go5rychg07Y="; + }) + ]; + }) super.reanimate-svg; + # Test data missing from sdist # https://github.com/ngless-toolkit/ngless/issues/152 NGLess = dontCheck super.NGLess; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index a2d80067cf0d..9ac9f1a7a1c3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5274,7 +5274,6 @@ broken-packages: - readme-lhs # failure in job https://hydra.nixos.org/build/233248229 at 2023-09-02 - readshp # failure in job https://hydra.nixos.org/build/233197835 at 2023-09-02 - really-simple-xml-parser # failure in job https://hydra.nixos.org/build/233195945 at 2023-09-02 - - reanimate-svg # failure in job https://hydra.nixos.org/build/233242271 at 2023-09-02 - reason-export # failure in job https://hydra.nixos.org/build/233212942 at 2023-09-02 - reasonable-lens # failure in job https://hydra.nixos.org/build/233233111 at 2023-09-02 - rebound # failure in job https://hydra.nixos.org/build/311055152 at 2025-11-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 067e27c54e79..d699e541caf3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -2874,7 +2874,6 @@ dont-distribute-packages: - reactor - readline-in-other-words - readpyc - - reanimate - record-aeson - record-gl - record-preprocessor @@ -3383,7 +3382,6 @@ dont-distribute-packages: - sv-svfactor - SVG2Q - svg2q - - svgone - swapper - switch - syb-with-class-instances-text diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 8c440508d42a..06463f06bff8 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -932,6 +932,15 @@ builtins.intersectAttrs super { # https://github.com/plow-technologies/servant-streaming/issues/12 servant-streaming-server = dontCheck super.servant-streaming-server; + reanimate-svg = overrideCabal (drv: { + buildTools = (drv.buildTools or [ ]) ++ [ + # needed for testsuite + pkgs.freefont_ttf + pkgs.librsvg + pkgs.pango + ]; + }) super.reanimate-svg; + # https://github.com/haskell-servant/servant/pull/1238 servant-client-core = if (pkgs.lib.getVersion super.servant-client-core) == "0.16" then diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1beae3013ab3..19b994b5e9c1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -577709,7 +577709,6 @@ self: { ]; description = "Animation library based on SVGs"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -577790,8 +577789,6 @@ self: { ]; description = "SVG file loader and serializer"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -673016,7 +673013,6 @@ self: { ]; description = "Optimise SVGs"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; mainProgram = "svgone"; } ) { };