From 40ea3bed4920932ca884d07175918422c7b4cf72 Mon Sep 17 00:00:00 2001
From: Wulfsta <wulfstawulfsta@gmail.com>
Date: Wed, 3 Jul 2024 20:26:17 -0400
Subject: [PATCH 1/2] gerbolyze: 3.1.7 -> 3.1.8

---
 pkgs/by-name/ge/gerbolyze/package.nix | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/ge/gerbolyze/package.nix b/pkgs/by-name/ge/gerbolyze/package.nix
index 2ce40c377234..60ca8b6d741b 100644
--- a/pkgs/by-name/ge/gerbolyze/package.nix
+++ b/pkgs/by-name/ge/gerbolyze/package.nix
@@ -6,12 +6,12 @@
 }:
 
 let
-  version = "3.1.7";
+  version = "3.1.8";
   src = fetchFromGitHub {
     owner = "jaseg";
     repo = "gerbolyze";
     rev = "v${version}";
-    hash = "sha256-0iTelSlUJUafclRowwsUAoO44nc/AXaOKXnZKfKOIaE=";
+    hash = "sha256-uF06aU9zT7LjYHreQ8aFQKn/wAesS31LvzHBgD50LfQ=";
     fetchSubmodules = true;
   };
 
@@ -43,22 +43,6 @@ 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";
@@ -77,7 +61,7 @@ in python3Packages.buildPythonApplication rec {
     python3Packages.python-slugify
     python3Packages.lxml
     python3Packages.gerbonara
-    resvg'
+    resvg
     svg-flatten
   ];
 
@@ -95,7 +79,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";

From e82c4b4a5b78e9f7cfa3ad53171e991fbbb681b3 Mon Sep 17 00:00:00 2001
From: Wulfsta <wulfstawulfsta@gmail.com>
Date: Wed, 3 Jul 2024 20:28:51 -0400
Subject: [PATCH 2/2] gerbolyze: add update script

---
 pkgs/by-name/ge/gerbolyze/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ge/gerbolyze/package.nix b/pkgs/by-name/ge/gerbolyze/package.nix
index 60ca8b6d741b..cdd489da8b5f 100644
--- a/pkgs/by-name/ge/gerbolyze/package.nix
+++ b/pkgs/by-name/ge/gerbolyze/package.nix
@@ -2,6 +2,7 @@
 , stdenv
 , python3Packages
 , fetchFromGitHub
+, gitUpdater
 , resvg
 }:
 
@@ -81,6 +82,10 @@ in python3Packages.buildPythonApplication rec {
 
   nativeCheckInputs = [ python3Packages.pytestCheckHook resvg svg-flatten ];
 
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "v";
+  };
+
   meta = with lib; {
     description = "Directly render SVG overlays into Gerber and Excellon files";
     homepage = "https://github.com/jaseg/gerbolyze";