Merge pull request #322005 from pbsds/fix-gerbolyze-1719161128

gerbolyze: unbreak by downgrading resvg

1 files changed, 18 insertions, 2 deletions

diff --git a/pkgs/by-name/ge/gerbolyze/package.nix b/pkgs/by-name/ge/gerbolyze/package.nix
index 0e61a64dd94b4..2ce40c3772342 100644
--- a/pkgs/by-name/ge/gerbolyze/package.nix
+++ b/pkgs/by-name/ge/gerbolyze/package.nix
@@ -43,6 +43,22 @@ let
       platforms = platforms.linux;
     };
   };
+
+  # FIXME: check if this downgrade is still required when bumping gerbolyze
+  # https://github.com/jaseg/gerbolyze/issues/47
+  resvg' = resvg.overrideAttrs (old: rec {
+    version = "0.41.0";
+    src = old.src.override {
+      rev = "v${version}";
+      hash = "sha256-plZiyEiBWeV2mwTsNK5Je8Axs/hcHH8aV2VpOix6QCY=";
+    };
+    cargoDeps = old.cargoDeps.overrideAttrs (lib.const {
+      name = "${old.pname}-${version}-vendor.tar.gz";
+      inherit src;
+      outputHash = "sha256-U7xzb9e9wh9XbLvlYQ0ofIjH8FuSzVcrXnrehQmZgww=";
+    });
+  });
+
 in python3Packages.buildPythonApplication rec {
   inherit version src;
   pname = "gerbolyze";
@@ -61,7 +77,7 @@ in python3Packages.buildPythonApplication rec {
     python3Packages.python-slugify
     python3Packages.lxml
     python3Packages.gerbonara
-    resvg
+    resvg'
     svg-flatten
   ];
 
@@ -79,7 +95,7 @@ in python3Packages.buildPythonApplication rec {
 
   pythonImportsCheck = [ "gerbolyze" ];
 
-  nativeCheckInputs = [ python3Packages.pytestCheckHook resvg svg-flatten ];
+  nativeCheckInputs = [ python3Packages.pytestCheckHook resvg' svg-flatten ];
 
   meta = with lib; {
     description = "Directly render SVG overlays into Gerber and Excellon files";