summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjgart <jgart@dismail.de>2022-09-10 10:43:41 -0500
committerGuix Patches Tester <>2022-09-10 16:46:23 +0100
commitd03ecff65f901ef372dcfd18aaf3d3dd82dc53f0 (patch)
treed22596d5afe87f2271d94985fde366f87e11cc09
parent1d690f7d1d42acd6e7b4dc92de462e6ac739fd77 (diff)
downloadguix-patches-d03ecff65f901ef372dcfd18aaf3d3dd82dc53f0.tar
guix-patches-d03ecff65f901ef372dcfd18aaf3d3dd82dc53f0.tar.gz
gnu: Add wiggle.
* gnu/packages/patchutils.scm (wiggle): New variable.
-rw-r--r--gnu/packages/patchutils.scm41
1 files changed, 41 insertions, 0 deletions
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index fdbcb8e1e1..dac3ff3957 100644
--- a/gnu/packages/patchutils.scm
+++ b/gnu/packages/patchutils.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
+;;; Copyright © 2022 jgart <jgart@dismail.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -21,6 +22,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages patchutils)
+ #:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix licenses)
@@ -40,6 +42,7 @@
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
+ #:use-module (gnu packages groff)
#:use-module (gnu packages gtk)
#:use-module (gnu packages less)
#:use-module (gnu packages mail)
@@ -441,6 +444,44 @@ Users can login allowing them to change the state of patches.")
(home-page "http://jk.ozlabs.org/projects/patchwork/")
(license gpl2+)))
+(define-public wiggle
+ (package
+ (name "wiggle")
+ (version "1.3")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/neilbrown/wiggle")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "18ilzr9sbal1j8p1d94ilm1j5blac5cngvcvjpdmgmpw6diy2ldf"))))
+ (build-system gnu-build-system)
+ (native-inputs (list groff))
+ (inputs (list ncurses))
+ (arguments
+ (list
+ #:make-flags #~(list "-I. -O3"
+ (string-append "CC=" #$(cc-for-target))
+ "INSTALL=\"install\""
+ "STRIP=-s"
+ (string-append "BINDIR=" #$output "/bin")
+ (string-append "MANDIR=" #$output "/share/man")
+ (string-append "PREFIX=" #$output))
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure)
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "./dotest")))))))
+ (home-page "http://neil.brown.name/wiggle/")
+ (synopsis "Tool for applying patches with conflicts")
+ (description
+ "@code{wiggle} attempts to apply patches to a target file even if the
+patches do not match perfectly.")
+ (license gpl2+)))
+
(define-public pwclient
(package
(name "pwclient")