aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Matei Pintilie <luca@lucamatei.com>2024-11-10 10:45:19 +0000
committerLuca Matei Pintilie <luca@lucamatei.com>2024-11-10 10:45:19 +0000
commit0c88d3d165113b7299a03849a293be59e8dd5214 (patch)
treea4b4a1dfd69d9389133003f38e3566994ae96bdf
parentf032a144e138f0fe1635a3f4fa2c382ecf38eefb (diff)
downloadvoid-packages-user/luca/mergiraf.tar
void-packages-user/luca/mergiraf.tar.gz
void-packages-user/luca/mergiraf.tar.bz2
void-packages-user/luca/mergiraf.tar.lz
void-packages-user/luca/mergiraf.tar.xz
void-packages-user/luca/mergiraf.tar.zst
void-packages-user/luca/mergiraf.zip
New package: mergiraf-0.2.0user/luca/mergiraf
-rw-r--r--srcpkgs/mergiraf/patches/fix-cargo-lock.patch14
-rw-r--r--srcpkgs/mergiraf/template14
2 files changed, 28 insertions, 0 deletions
diff --git a/srcpkgs/mergiraf/patches/fix-cargo-lock.patch b/srcpkgs/mergiraf/patches/fix-cargo-lock.patch
new file mode 100644
index 00000000000..d8b7018232a
--- /dev/null
+++ b/srcpkgs/mergiraf/patches/fix-cargo-lock.patch
@@ -0,0 +1,14 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 84be098..8aa7a76 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -687,7 +687,7 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+ [[package]]
+ name = "mergiraf"
+-version = "0.1.1"
++version = "0.2.0"
+ dependencies = [
+ "cc",
+ "clap",
+
diff --git a/srcpkgs/mergiraf/template b/srcpkgs/mergiraf/template
new file mode 100644
index 00000000000..aaddea0c317
--- /dev/null
+++ b/srcpkgs/mergiraf/template
@@ -0,0 +1,14 @@
+# Template file for 'mergiraf'
+pkgname=mergiraf
+version=0.2.0
+revision=1
+build_style=cargo
+depends="git"
+checkdepends="${depends}"
+short_desc="Syntax-aware git merge driver for programming languages and file formats"
+maintainer="Luca Matei Pintilie <luca@lucamatei.com>"
+license="GPL-3.0-or-later"
+homepage="https://mergiraf.org/"
+changelog="https://codeberg.org/mergiraf/mergiraf/releases"
+distfiles="https://codeberg.org/mergiraf/mergiraf/archive/v${version}.tar.gz"
+checksum=fb496ef6470091dd9f133aeea18852067ce82c0dbccbdf1390dd66aec5e60e03