[bug#57688] [PATCH] gnu: Add wiggle.

[bug#57688] [PATCH] gnu: Add wiggle.

[jgart via Guix-patches via]

* gnu/packages/patchutils.scm (wiggle): New variable.

Here's wiggle 

~ jgart

---
 gnu/packages/patchutils.scm | 43 +++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index fdbcb8e1e1..4c2eb4f6cb 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.
 ;;;
@@ -40,6 +41,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 +443,47 @@ (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
+       `(#: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 #:allow-other-keys)
+                (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 file even if the file
+doesn't match the target file perfectly.")
+      (license gpl2+)))
+
 (define-public pwclient
   (package
     (name "pwclient")
-- 
2.37.3

[bug#57688] [PATCH v2] gnu: Add wiggle.

[jgart via Guix-patches via]

* gnu/packages/patchutils.scm (wiggle): New variable.

Here's version 2.

I just reworded the description.
---
 gnu/packages/patchutils.scm | 43 +++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index fdbcb8e1e1..b81d13e9ca 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.
 ;;;
@@ -40,6 +41,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 +443,47 @@ (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
+       `(#: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 #:allow-other-keys)
+                (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

[bug#57688] [PATCH] gnu: Add wiggle.

[Maxime Devos]

[-- Attachment #1.1.1: Type: text/plain, Size: 949 bytes --]



On 09-09-2022 01:15, jgart via Guix-patches via wrote:
> +       `(#: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))

%output is undocumented.  Use #$output instead.

> +          #:phases
> +          (modify-phases %standard-phases
> +            (delete 'configure)
> +            (replace 'check
> +              (lambda* (#:key inputs ouputs #:allow-other-keys)
> +                (invoke "./dotest"))))))

Being unconditional, this breaks --without-tests.  Have you run
"./pre-inst-env guix lint wiggle"?  There's a linter for detecting that.

Greetings,
Maxime.

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

[bug#57688] [PATCH v3] gnu: Add wiggle.

[jgart via Guix-patches via]

* gnu/packages/patchutils.scm (wiggle): New variable.

Hi Maxime,

Yes, I missed that one :()

Thanks for the review. Here's v3.

all best,

jgart

---
 gnu/packages/patchutils.scm | 44 +++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index fdbcb8e1e1..cd96c21ceb 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.
 ;;;
@@ -40,6 +41,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 +443,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
+       `(#: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

[bug#57688] [PATCH v4] gnu: Add wiggle.

[jgart via Guix-patches via]

* gnu/packages/patchutils.scm (wiggle): New variable.

Hi again Maxime,

Here's v4. Forgot to add the gexps everywhere.

#$all best,

jgart

---
 gnu/packages/patchutils.scm | 45 +++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index fdbcb8e1e1..86e052a18f 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

[bug#57688] [PATCH v4] gnu: Add wiggle.

[Maxime Devos]

[-- Attachment #1.1.1: Type: text/plain, Size: 1186 bytes --]



On 09-09-2022 06:14, jgart wrote:
> +      (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

Nitpick: using G-exp for #:make-flags but not #:phases is inconsistent, 
though that's something a committer could adjust without any trouble.

> +                  (delete 'configure)
> +                  (replace 'check
> +                    (lambda* (#:key inputs ouputs tests? #:allow-other-keys)
> +                      (when tests?
> +                        (invoke "./dotest")))))))

That's what I had in mind, thanks.  For completeness, ideally someone 
would check the sources for malware, but otherwise LGTM.

Greetings,
Maxime.

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

[bug#57688] [PATCH v5] gnu: Add wiggle.

[jgart via Guix-patches via]

* 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

[bug#57688] [PATCH v5] gnu: Add wiggle.

[( via Guix-patches via]

Hello! :D

On Fri Sep 9, 2022 at 3:06 PM BST, jgart via Guix-patches via wrote:
> +(define-public wiggle
> +    (package
     ^^
Unnecessary indentation here.

> +      (name "wiggle")
> +      (version "1.3")
> +      (source
> +       (origin
         ^^^^^^^^
Change to `(source (origin'.

> +         (method git-fetch)
> +         (uri
> +          (git-reference
            ^^^^^^^^^^^^^^^
Change to `(uri (git-reference'.

> +      (inputs
> +        (list ncurses))
         ^^^^^^^
Change to `(inputs (list ...))'.

> +      (arguments
> +        (list #:make-flags
          ^
This extra indentation isn't the norm.

> +              #~(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))
                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Duplicate `CC' definition.

> +                      (string-append "PREFIX=" #$output))
> +               #:phases
> +               #~(modify-phases %standard-phases
> +                   (delete 'configure)
> +                   (replace 'check
> +                     (lambda* (#:key inputs ouputs tests? #:allow-other-keys)
                                        ^^^^^^^^^^^^^
These two are unnecessary, and the latter has a typo anyway.

> +      (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
   ^^^^^^^^
Add indentation here.

    -- (

[bug#57688] [PATCH v5] gnu: Add wiggle.

[jgart via Guix-patches via]

On Sat, 10 Sep 2022 00:03:02 +0100 "(" <paren@disroot.org> wrote:
> Hello! :D

hiya paren ;#~ ;#$ ;()

> Duplicate `CC' definition.
> These two are unnecessary, and the latter has a typo anyway.

I edited these by hand and let `guix style` take care of the rest

thanks for the review!

look out for v6,

jgart

[bug#57688] [PATCH v6] gnu: Add wiggle.

[jgart via Guix-patches via]

* gnu/packages/patchutils.scm (wiggle): New variable.
---
 gnu/packages/patchutils.scm | 44 +++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index fdbcb8e1e1..83fe6ac762 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,47 @@ (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 "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")
-- 
2.37.3

[bug#57688] [PATCH v6] gnu: Add wiggle.

[( via Guix-patches via]

Hello again!

`guix style's choices can be a wee bit dubious at times, as seen below:

On Sat Sep 10, 2022 at 2:17 AM BST, jgart via Guix-patches via wrote:
> +     (list #:make-flags #~(list "-I. -O3"
              ^^^^^^^^^^^^^^^
Put the value on the next line.
> +                                (string-append "CC="
> +                                               #$(cc-for-target))
                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Put this expression all on one line.
> +                                "INSTALL=\"install\""
> +                                "STRIP=-s"
> +                                (string-append "BINDIR="
> +                                               #$output "/bin")
                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Same here.
> +                                (string-append "MANDIR="
> +                                               #$output "/share/man")
                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Same here.
> +                                (string-append "PREFIX="
> +                                               #$output))
                                   ^^^^^^^^^^^^^^^^^^^^^^^^
Same here.
> +           #:phases #~(modify-phases %standard-phases
              ^^^^^^^^^^^
Put the value on the next line here, too.

    -- (

[bug#57688] [PATCH v6] gnu: Add wiggle.

[jgart via Guix-patches via]

On Sat, 10 Sep 2022 08:39:07 +0100 "(" <paren@disroot.org> wrote:

This package really turned out to need a lot of wiggling.

Thanks for the review.

v7

[bug#57688] [PATCH v7] gnu: Add wiggle.

[jgart via Guix-patches via]

* gnu/packages/patchutils.scm (wiggle): New variable.
---
 gnu/packages/patchutils.scm | 41 +++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

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 @@ (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,44 @@ (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 "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")
-- 
2.37.3

[bug#57688] [PATCH v7] gnu: Add wiggle.

[( via Guix-patches via]

On Sat Sep 10, 2022 at 4:43 PM BST, jgart via Guix-patches via wrote:
> +    (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")))))))

Ah, no, sorry, that was ambiguous. What I meant was:

> +    (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")))))))

    -- (

[bug#57688] [PATCH v7] gnu: Add wiggle.

[jgart via Guix-patches via]

On Sat, 10 Sep 2022 17:49:30 +0100 "(" <paren@disroot.org> wrote:
> On Sat Sep 10, 2022 at 4:43 PM BST, jgart via Guix-patches via wrote:
> Ah, no, sorry, that was ambiguous. What I meant was:
> 
> > +    (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")))))))
> 
>     -- (

Not sure what you mean here. If I move it back it will not be aligned with the above.

Could you explain in the context of the whole v7 patch?

[bug#57688] [PATCH v7] gnu: Add wiggle.

[( via Guix-patches via]

I basically meant that arguments should be written like

  #:foo bar

if `bar' takes up only one line, and

  #:foo
  bar

if `bar' takes up multiple lines, since

  #:phases #~(modify-phases %standard-phases
               ...)

wastes a LOT of horizontal space.

    -- (

bug#57688: [PATCH v7] gnu: Add wiggle.

[Liliana Marie Prikler]

Am Samstag, dem 10.09.2022 um 10:43 -0500 schrieb jgart:
> * gnu/packages/patchutils.scm (wiggle): New variable.
Applied with some wiggling.

Cheers

[bug#57688] [PATCH v7] gnu: Add wiggle.

[jgart via Guix-patches via]

On Sun, 11 Sep 2022 12:46:29 +0200 Liliana Marie Prikler <liliana.prikler@gmail.com> wrote:
> Am Samstag, dem 10.09.2022 um 10:43 -0500 schrieb jgart:
> > * gnu/packages/patchutils.scm (wiggle): New variable.
> Applied with some wiggling.
> 
> Cheers

Thanks Liliana!

~~
jgart