From 4fc8a9d25581cc8c45886e716cea94e29c096b0e Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Wed, 13 Sep 2023 09:04:18 -0400
Subject: [PATCH 1/2] svg2pdf: 0.6.0 -> 0.7.0

Diff: https://github.com/typst/svg2pdf/compare/v0.6.0...v0.7.0

Changelog: https://github.com/typst/svg2pdf/releases/tag/v0.7.0
---
 pkgs/tools/graphics/svg2pdf/default.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/graphics/svg2pdf/default.nix b/pkgs/tools/graphics/svg2pdf/default.nix
index 10f05f51a13a..c2f02aeb751c 100644
--- a/pkgs/tools/graphics/svg2pdf/default.nix
+++ b/pkgs/tools/graphics/svg2pdf/default.nix
@@ -1,25 +1,25 @@
 { lib
 , rustPlatform
-, fetchCrate
+, fetchFromGitHub
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "svg2pdf";
-  version = "0.6.0";
-  # This cargo package is usually a library, hence it does not track a
-  # Cargo.lock by default so we use fetchCrate
-  src = fetchCrate {
-    inherit version pname;
-    sha256 = "sha256-RZpJ2HNqO1y6ZQjxdd7LEH2yS5QyjSqQFuyU4BwFA+4=";
-  };
-  cargoHash = "sha256-wJr1K/PUewScGjVLBmg9lpDKyn5CIUK2zac9/+JvnbE=";
-  buildFeatures = [ "cli" ];
+  version = "0.7.0";
 
-  doCheck = true;
+  src = fetchFromGitHub {
+    owner = "typst";
+    repo = "svg2pdf";
+    rev = "v${version}";
+    hash = "sha256-X5L3UA/BJw8M2G35biCQjExYe68fB14meW4ILPEyesc=";
+  };
+  cargoHash = "sha256-zR4nKzbbCzSM1JVxj3nk6yQAfpPmfVQGabkU7lzLAi0=";
+  buildFeatures = [ "cli" ];
 
   meta = with lib; {
     description = "Convert SVG files to PDFs";
     homepage = "https://github.com/typst/svg2pdf";
+    changelog = "https://github.com/typst/svg2pdf/releases/tag/${src.rev}";
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ doronbehar ];
   };

From 18a9d77cb004f04a242d9880cc85f7f720f1c7ea Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Wed, 13 Sep 2023 09:05:27 -0400
Subject: [PATCH 2/2] svg2pdf: clarify license, add figsoda to maintainers

---
 pkgs/tools/graphics/svg2pdf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/svg2pdf/default.nix b/pkgs/tools/graphics/svg2pdf/default.nix
index c2f02aeb751c..4e4403860455 100644
--- a/pkgs/tools/graphics/svg2pdf/default.nix
+++ b/pkgs/tools/graphics/svg2pdf/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
     description = "Convert SVG files to PDFs";
     homepage = "https://github.com/typst/svg2pdf";
     changelog = "https://github.com/typst/svg2pdf/releases/tag/${src.rev}";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ doronbehar ];
+    license = with licenses; [ asl20 mit ];
+    maintainers = with maintainers; [ doronbehar figsoda ];
   };
 }