haskellPackages.reanimate: unbreak (#475922)

2026-03-30 11:06:10 +00:00
parent 23f5520c3b 4b7174296d
commit d300005877
7 changed files with 98 additions and 10 deletions
@@ -843,6 +843,13 @@
    githubId = 209175;
    name = "Alesya Huzik";
  };
+  Ai-Ya-Ya = {
+    email = "spg2500@gmail.com";
+    github = "Ai-Ya-Ya";
+    githubId = 72513839;
+    matrix = "aiya:catgirl.cloud";
+    name = "aiya";
+  };
  aij = {
    email = "aij+git@mrph.org";
    github = "aij";
@@ -2519,9 +2519,74 @@ with haskellLib;
    doJailbreak
  ];

-  # Test suite doesn't support hspec 2.8
-  # https://github.com/zellige/hs-geojson/issues/29
-  geojson = dontCheck super.geojson;
+  # too strict bounds on extra < 1.8
+  # https://github.com/georgefst/svgone/pull/3
+  svgone = doJailbreak super.svgone;
+
+  # 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;
+
+  # 2026-01-06: modernize to GHC 9.10.3
+  reanimate = overrideCabal (drv: {
+    # file in Hackage but not on github, need to remove here
+    # test relies on hegometry but that was removed as a dependency
+    # https://github.com/reanimate/reanimate/commit/f58a00e
+    prePatch = drv.prePatch or "" + ''
+      rm -f examples/decompose.hs
+    '';
+    patches = (drv.patches or [ ]) ++ [
+      # variant of PR https://github.com/reanimate/reanimate/pull/317
+      (pkgs.fetchpatch2 {
+        name = "modernize-to-ghc-9.10.3";
+        url = "https://github.com/reanimate/reanimate/commit/273f48c2b82dcfa027481133a6a606e73a22461b.patch";
+        sha256 = "sha256-aibbIoc54I4Ibg6t2o8vykL8MqzmxLvayUNa8MiibEw=";
+      })
+    ];
+  }) super.reanimate;

  # Test data missing from sdist
  # https://github.com/ngless-toolkit/ngless/issues/152
@@ -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
@@ -127,6 +127,9 @@ extra-packages:

 # keep-sorted start skip_lines=1 case=no
 package-maintainers:
+  Ai-Ya-Ya:
+    - reanimate
+    - reanimate-svg
  alexfmpe:
    - basic-sop
    - commutative-semigroups
@@ -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
@@ -932,6 +932,24 @@ builtins.intersectAttrs super {
  # https://github.com/plow-technologies/servant-streaming/issues/12
  servant-streaming-server = dontCheck super.servant-streaming-server;

+  reanimate = overrideCabal (drv: {
+    buildTools = (drv.buildTools or [ ]) ++ [
+      # needed for testsuite
+      pkgs.ffmpeg
+      pkgs.librsvg
+      pkgs.texliveFull
+    ];
+  }) super.reanimate;
+
+  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
@@ -577709,7 +577709,7 @@ self: {
      ];
      description = "Animation library based on SVGs";
      license = lib.licenses.publicDomain;
-      hydraPlatforms = lib.platforms.none;
+      maintainers = [ lib.maintainers.Ai-Ya-Ya ];
    }
  ) { };

@@ -577790,8 +577790,7 @@ self: {
      ];
      description = "SVG file loader and serializer";
      license = lib.licensesSpdx."BSD-3-Clause";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
+      maintainers = [ lib.maintainers.Ai-Ya-Ya ];
    }
  ) { };

@@ -673016,7 +673015,6 @@ self: {
      ];
      description = "Optimise SVGs";
      license = lib.licensesSpdx."BSD-3-Clause";
-      hydraPlatforms = lib.platforms.none;
      mainProgram = "svgone";
    }
  ) { };