From b797ec84f83e99160e7ab215f04da22adbca72b7 Mon Sep 17 00:00:00 2001
From: Emmanuel Genga <84174227+genga898@users.noreply.github.com>
Date: Wed, 13 Nov 2024 23:30:54 +0300
Subject: [PATCH] mergiraf: 0.2.0 -> 0.3.0 (#355653)

---
 pkgs/by-name/me/mergiraf/Cargo.lock  | 23 ++++++++++++++++++-----
 pkgs/by-name/me/mergiraf/package.nix | 22 +++++++++++++++-------
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/me/mergiraf/Cargo.lock b/pkgs/by-name/me/mergiraf/Cargo.lock
index 84be0981f768..a7e2ac84ca83 100644
--- a/pkgs/by-name/me/mergiraf/Cargo.lock
+++ b/pkgs/by-name/me/mergiraf/Cargo.lock
@@ -687,7 +687,7 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "mergiraf"
-version = "0.1.1"
+version = "0.3.0"
 dependencies = [
  "cc",
  "clap",
@@ -705,6 +705,7 @@ dependencies = [
  "tree-sitter",
  "tree-sitter-c-sharp",
  "tree-sitter-cpp",
+ "tree-sitter-dart",
  "tree-sitter-go",
  "tree-sitter-html",
  "tree-sitter-java",
@@ -1180,10 +1181,21 @@ dependencies = [
  "tree-sitter-language",
 ]
 
+[[package]]
+name = "tree-sitter-dart"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19f1f70b80ce41343e14aafcef67b5ba2e9de89587535b4aabbabb8036f4e38a"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "tree-sitter-go"
-version = "0.23.1"
-source = "git+https://github.com/tree-sitter/tree-sitter-go.git?rev=ecc20866d1bd4d80f3aef06456ed3014d4d598e6#ecc20866d1bd4d80f3aef06456ed3014d4d598e6"
+version = "0.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a83995691e929d60d7946ab29a6cace465f0cf5bfdb62d7721f76278537d59ad"
 dependencies = [
  "cc",
  "tree-sitter-language",
@@ -1257,10 +1269,11 @@ dependencies = [
 [[package]]
 name = "tree-sitter-yaml"
 version = "0.6.1"
-source = "git+https://github.com/wetneb/tree-sitter-yaml.git?rev=7b5199133abceb03d6d1d8f1672f49b4f2a71442#7b5199133abceb03d6d1d8f1672f49b4f2a71442"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aad27ec46ad343d8b514f64dd3fdffb478c592ece561b6c935d90ef55589c6b6"
 dependencies = [
  "cc",
- "tree-sitter-language",
+ "tree-sitter",
 ]
 
 [[package]]
diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix
index d0437be51e6f..6e888e0bfa21 100644
--- a/pkgs/by-name/me/mergiraf/package.nix
+++ b/pkgs/by-name/me/mergiraf/package.nix
@@ -6,36 +6,44 @@
 
   # native check inputs
   git,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "mergiraf";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "mergiraf";
     repo = "mergiraf";
     rev = "refs/tags/v${version}";
-    hash = "sha256-egtX2daCbPXi5rX2OxbEZA/VI9R4HMj5LRKbUEBFo+E=";
+    hash = "sha256-yBLSN5+rPPoxA6Bn1O2NNGNo9cDfowZdaOtVvvUmNAM=";
   };
 
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "tree-sitter-go-0.23.1" = "sha256-elPqkvVYs0vADOuN/umDteWP5hqcXhQAoSkqYDtTxaU=";
       "tree-sitter-xml-0.7.0" = "sha256-RTWvOUAs3Uql9DKsP1jf9FZZHaZORE40GXd+6g6RQZw=";
-      "tree-sitter-yaml-0.6.1" = "sha256-gS+SjOnGl/86U9VV/y1ca7naYIe7DAOvOv++jCRLTKo=";
     };
   };
 
-  nativeCheckInputs = [ git ];
+  nativeCheckInputs = [
+    git
+    versionCheckHook
+  ];
+
+  versionCheckProgramArg = [ "--version" ];
 
   meta = {
     description = "Syntax-aware git merge driver for a growing collection of programming languages and file formats";
-    mainProgram = "mergiraf";
     homepage = "https://mergiraf.org/";
+    changelog = "https://codeberg.org/mergiraf/mergiraf/releases/v${version}";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ zimbatm ];
+    maintainers = with lib.maintainers; [
+      zimbatm
+      genga898
+    ];
+    mainProgram = "mergiraf";
   };
 }