From 2181b0f5fb669064dd6e5fe44f4cd2284b17ba7a Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Thu, 2 Apr 2026 00:29:55 +0800 Subject: gnu: Add mergiraf. * gnu/packages/version-control.scm (mergiraf): New variable. * gnu/packages/rust-crates.scm (lookup-cargo-inputs): Add entry for mergiraf. Change-Id: I4b7b16e671e8f9a99fd987410c2c57698ee35219 Signed-off-by: Efraim Flashner --- gnu/packages/version-control.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 1dca8d33870..bd485e563ff 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -53,7 +53,7 @@ ;;; Copyright © 2023 Steve George ;;; Copyright © 2023 Josselin Poiret ;;; Copyright © 2024 Hilton Chain -;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024, 2026 Zheng Junjie ;;; Copyright © 2023 Ryan Desfosses ;;; Copyright © 2024 Suhail Singh ;;; Copyright © 2024 Simon Tournier @@ -839,6 +839,28 @@ everything from small to very large projects with speed and efficiency.") ((#:configure-flags flags #~'()) (if (%current-target-system) git-cross-configure-flags #~(list))))))) +(define-public mergiraf + (package + (name "mergiraf") + (version "0.16.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "mergiraf" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0b5rsdz1s68kc37rqvjwpgwj2651arigbzgcf7chdspzjc9fkllk")))) + (build-system cargo-build-system) + (arguments + (list #:install-source? #f)) + ;; for tests + (native-inputs (list git-minimal/pinned)) + (inputs (cargo-inputs 'mergiraf)) + (home-page "https://mergiraf.org/") + (synopsis "Syntax-aware merge driver for Git") + (description "This package provides a syntax-aware merge driver for Git.") + (license license:gpl3))) + (define-public python-klaus (package (name "python-klaus") -- cgit v1.3