From eaf538df401aa7706b1cb865ca8ca88283863165 Mon Sep 17 00:00:00 2001 From: Dariqq Date: Sun, 26 Jan 2025 12:27:09 +0000 Subject: gnu: Add python-merge3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-merge3): New variable. Change-Id: If3238c86bb3c9b380facd02a238f5ebecc74d3de Co-authored-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 12aa0079acd..34d20dda8a7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9928,6 +9928,24 @@ algorithm. Patiencediff provides a good balance of performance, nice output for 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 + "This Python library implements 3-way merge for text.") + (license license:gpl2+))) + (define-public python-wmctrl (package (name "python-wmctrl") -- cgit v1.3