GNU bug report logs - #75859
[PATCH 0/4] breezy: Update to 3.3.9.

Previous Next

Full log

View this message in rfc822 format

From: Dariqq <dariqq <at> posteo.net>
To: 75859 <at> debbugs.gnu.org
Cc: Dariqq <dariqq <at> posteo.net>, Lars-Dominik Braun <lars <at> 6xq.net>, Marius Bakke <marius <at> gnu.org>, Munyoki Kilyungi <me <at> bonfacemunyoki.com>, Sharlatan Hellseher <sharlatanus <at> gmail.com>, Tanguy Le Carrour <tanguy <at> bioneland.org>, jgart <jgart <at> dismail.de>
Subject: [bug#75859] [PATCH 3/4] gnu: Add python-merge3.
Date: Sun, 26 Jan 2025 12:27:09 +0000

* gnu/packages/python-xyz.scm (python-merge3): New variable.

Change-Id: If3238c86bb3c9b380facd02a238f5ebecc74d3de
---
 gnu/packages/python-xyz.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ada1c78ce4..1d77330e1e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9728,6 +9728,23 @@ (define-public python-patiencediff
 humans, and implementation simplicity.")
     (license license:gpl2+)))
 
+(define-public python-merge3
+  (package
+    (name "python-merge3")
+    (version "0.0.15")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "merge3" version))
+       (sha256
+        (base32 "1brb97v24i5ym3cfxsv416a0m1n78s1aqllmwg4xymjdv09w5snk"))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-setuptools python-wheel))
+    (home-page "https://github.com/breezy-team/merge3")
+    (synopsis "Python implementation of 3-way merge")
+    (description "A Python implementation of 3-way merge of texts.")
+    (license license:gpl2+)))
+
 (define-public python-wmctrl
   (package
     (name "python-wmctrl")
-- 
2.47.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.