From: jgart via Guix-patches via <guix-patches@gnu.org>
To: 57688@debbugs.gnu.org
Cc: Maxime Devos <maximedevos@telenet.be>, jgart <jgart@dismail.de>
Subject: [bug#57688] [PATCH v5] gnu: Add wiggle.
Date: Fri, 9 Sep 2022 09:06:13 -0500 [thread overview]
Message-ID: <20220909140612.1910-1-jgart@dismail.de> (raw)
In-Reply-To: <20220908231459.20365-1-jgart@dismail.de>
* gnu/packages/patchutils.scm (wiggle): New variable.
no probs, here's v5
---
gnu/packages/patchutils.scm | 45 +++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index fdbcb8e1e1..e87d0a2e86 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 @@ (define-module (gnu packages patchutils)
#: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,48 @@ (define pythonpath
(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 "CC=" #$(cc-for-target))
+ (string-append "PREFIX=" #$output))
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (replace 'check
+ (lambda* (#:key inputs ouputs 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")
--
2.37.3
next prev parent reply other threads:[~2022-09-09 14:08 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-08 23:15 [bug#57688] [PATCH] gnu: Add wiggle jgart via Guix-patches via
2022-09-08 23:24 ` [bug#57688] [PATCH v2] " jgart via Guix-patches via
2022-09-08 23:51 ` [bug#57688] [PATCH] " Maxime Devos
2022-09-09 1:27 ` [bug#57688] [PATCH v3] " jgart via Guix-patches via
2022-09-09 4:14 ` [bug#57688] [PATCH v4] " jgart via Guix-patches via
2022-09-09 12:35 ` Maxime Devos
2022-09-09 14:06 ` jgart via Guix-patches via [this message]
2022-09-09 23:03 ` [bug#57688] [PATCH v5] " ( via Guix-patches via
2022-09-10 1:15 ` jgart via Guix-patches via
2022-09-10 1:17 ` [bug#57688] [PATCH v6] " jgart via Guix-patches via
2022-09-10 7:39 ` ( via Guix-patches via
2022-09-10 14:40 ` jgart via Guix-patches via
2022-09-10 15:43 ` [bug#57688] [PATCH v7] " jgart via Guix-patches via
2022-09-10 16:49 ` ( via Guix-patches via
2022-09-10 17:33 ` jgart via Guix-patches via
2022-09-10 17:39 ` ( via Guix-patches via
2022-09-11 10:46 ` bug#57688: " Liliana Marie Prikler
2022-09-11 11:23 ` [bug#57688] " jgart via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220909140612.1910-1-jgart@dismail.de \
--to=guix-patches@gnu.org \
--cc=57688@debbugs.gnu.org \
--cc=jgart@dismail.de \
--cc=maximedevos@telenet.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).