GNU bug report logs - #53920
[PATCH] gnu: lesspipe: Update to 2.02.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 53920 in the body.
You can then email your comments to 53920 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: lesspipe: Update to 2.02.
Date: Thu, 10 Feb 2022 17:52:31 +0100

* gnu/packages/less.scm (lesspipe): Update to 2.02.
---
 gnu/packages/less.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/less.scm b/gnu/packages/less.scm
index e23b5d0c24..3322321ac6 100644
--- a/gnu/packages/less.scm
+++ b/gnu/packages/less.scm
@@ -59,7 +59,7 @@ text editors.")
 (define-public lesspipe
   (package
     (name "lesspipe")
-    (version "1.91")
+    (version "2.02")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -68,7 +68,7 @@ text editors.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "04dqvq6j4h451xqbvxzv6pv679hzzfm39pdm5vg7h3r45gzg0kps"))))
+                "15lcgawwqlpwa3kra44nnyx0jmidjqdq45xcr5q90kz8iqix3ll7"))))
     (build-system gnu-build-system)
     (arguments
      '(#:tests? #f                      ; no tests
-- 
2.30.2

Message #8 received at 53920 <at> debbugs.gnu.org (full text, mbox):

From: Brice Waegeneire <brice <at> waegenei.re>
To: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
Cc: 53920 <at> debbugs.gnu.org
Subject: Re: bug#53920: [PATCH] gnu: lesspipe: Update to 2.02.
Date: Sat, 12 Feb 2022 10:48:27 +0100

Hello Hartmut,

Hartmut Goebel <h.goebel <at> crazy-compilers.com> writes:

> * gnu/packages/less.scm (lesspipe): Update to 2.02.
> ---
>  gnu/packages/less.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

[...]

Thank you for the patch, I wasn't able to build it tho. Because the previsou git
tag was named "1.91" and the latest one is "v2.02", so the commit field from
git-reference need to be adjusted.  Did you managed to build and test it on your
side before sending the patch?

Cheers,
- Brice

Message #13 received at 53920 <at> debbugs.gnu.org (full text, mbox):

From: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
To: Brice Waegeneire <brice <at> waegenei.re>
Cc: 53920 <at> debbugs.gnu.org
Subject: Re: bug#53920: [PATCH] gnu: lesspipe: Update to 2.02.
Date: Sun, 20 Feb 2022 17:54:54 +0100

Am 12.02.22 um 10:48 schrieb Brice Waegeneire:
> Did you managed to build and test it on your
> side before sending the patch?

I though I did, but apparently I dd not. When looking at it, I saw that 
quite some stuff changed under the hood, too. I’ll send a new patch 
these days.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel <at> crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Message #16 received at 53920 <at> debbugs.gnu.org (full text, mbox):

From: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
To: 53920 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: lesspipe: Update to 2.02.
Date: Tue, 22 Feb 2022 10:16:59 +0100

* gnu/packages/less.scm (lesspipe): Update to 2.02.
  [arguments]<phases>{configure} Adjust to updated source.
  {fix-makefile}: New phase.
  {patch-tput-and-file}: rename into …
  {patch-command-paths}: this; patch other relevant scripts.
---
 gnu/packages/less.scm | 58 +++++++++++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/less.scm b/gnu/packages/less.scm
index e23b5d0c24..a9775ecdf0 100644
--- a/gnu/packages/less.scm
+++ b/gnu/packages/less.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke <at> gnu.org>
 ;;; Copyright © 2020, 2021 Michael Rohleder <mike <at> rohleder.de>
+;;; Copyright © 2022 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -59,38 +60,53 @@ text editors.")
 (define-public lesspipe
   (package
     (name "lesspipe")
-    (version "1.91")
+    (version "2.02")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/wofr06/lesspipe")
-                    (commit version)))
+                    (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "04dqvq6j4h451xqbvxzv6pv679hzzfm39pdm5vg7h3r45gzg0kps"))))
+                "15lcgawwqlpwa3kra44nnyx0jmidjqdq45xcr5q90kz8iqix3ll7"))))
     (build-system gnu-build-system)
     (arguments
      '(#:tests? #f                      ; no tests
-       #:phases (modify-phases %standard-phases
-                  (replace 'configure
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (let ((out (assoc-ref outputs "out")))
-                        (delete-file "Makefile") ; force generating
-                        (invoke "./configure"
-                                (string-append "--prefix=" out)
-                                "--yes"))))
-                  (add-before 'install 'patch-tput-and-file
-                    (lambda* (#:key inputs #:allow-other-keys)
-                      (substitute* "lesspipe.sh"
-                        (("tput colors")
-                         (string-append (search-input-file inputs "/bin/tput")
-                                        " colors"))
-                        (("file -")
-                         (string-append (search-input-file inputs "/bin/file")
-                                        " -"))))))))
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; configure is a perl script which the standard configure phase
+             ;; fails to execute
+             (invoke "./configure"
+                     (string-append "--prefix=" (assoc-ref outputs "out")))))
+         (add-before 'install 'fix-makefile
+           (lambda _
+               (substitute* "Makefile"
+                 (("\\$\\(DESTDIR\\)/etc") "$(DESTDIR)$(PREFIX)/etc"))))
+         (add-before 'install 'patch-command-paths
+           ;; Depending on the content of the file to be displayed and some
+           ;; settings, lesspipe trees to use a large variety of external
+           ;; commands, e.g. rpm, dpkg, vimcolor.  We only link the essential
+           ;; ones to avoid this package to pull in all these dependencies
+           ;; which might never ever we used.
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((file (search-input-file inputs "/bin/file"))
+                   (tput (search-input-file inputs "/bin/tput")))
+               (substitute* "sxw2txt"
+                 (("^use warnings;" line)
+                  (string-append line "use lib '" file "';")))
+               (substitute* "lesscomplete"
+                 (("file -") (string-append file " -")))
+               (substitute* "lesspipe.sh"
+                 (("tput colors")
+                  (string-append tput " colors"))
+                 (("file -")
+                  (string-append file " -")))))))))
     (inputs
-     (list file ncurses))  ; for tput
+     (list file
+           ncurses))  ; for tput
     (native-inputs (list perl))
     (home-page "https://github.com/wofr06/lesspipe")
     (synopsis "Input filter for less")
-- 
2.30.2

Message #19 received at 53920 <at> debbugs.gnu.org (full text, mbox):

From: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
To: 53920 <at> debbugs.gnu.org
Subject: [PATCH v3] gnu: lesspipe: Update to 2.03.
Date: Tue, 22 Feb 2022 19:39:05 +0100

* gnu/packages/less.scm (lesspipe): Update to 2.03.
  [arguments] Use new style. <phases>{configure} Adjust to updated source.
  {fix-makefile} New phase.
  {patch-tput-and-file} rename into …
  {patch-command-paths} this; patch other relevant scripts.
  [inputs] Add perl-archive-zip.
---
 gnu/packages/less.scm | 66 ++++++++++++++++++++++++++++---------------
 1 file changed, 44 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/less.scm b/gnu/packages/less.scm
index e23b5d0c24..ede6238d25 100644
--- a/gnu/packages/less.scm
+++ b/gnu/packages/less.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke <at> gnu.org>
 ;;; Copyright © 2020, 2021 Michael Rohleder <mike <at> rohleder.de>
+;;; Copyright © 2022 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,10 +21,12 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages less)
+  #:use-module (guix gexp)
   #:use-module (guix licenses)
   #:use-module (gnu packages)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages perl-compression)
   #:use-module (gnu packages file)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -59,38 +62,57 @@ text editors.")
 (define-public lesspipe
   (package
     (name "lesspipe")
-    (version "1.91")
+    (version "2.03")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/wofr06/lesspipe")
-                    (commit version)))
+                    (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "04dqvq6j4h451xqbvxzv6pv679hzzfm39pdm5vg7h3r45gzg0kps"))))
+                "0hvqs7c2scjzyanylp7f2r1kpdp9v5qvgarhwvaisx9q1d0hiqy9"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:tests? #f                      ; no tests
-       #:phases (modify-phases %standard-phases
-                  (replace 'configure
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (let ((out (assoc-ref outputs "out")))
-                        (delete-file "Makefile") ; force generating
-                        (invoke "./configure"
-                                (string-append "--prefix=" out)
-                                "--yes"))))
-                  (add-before 'install 'patch-tput-and-file
-                    (lambda* (#:key inputs #:allow-other-keys)
-                      (substitute* "lesspipe.sh"
-                        (("tput colors")
-                         (string-append (search-input-file inputs "/bin/tput")
-                                        " colors"))
-                        (("file -")
-                         (string-append (search-input-file inputs "/bin/file")
-                                        " -"))))))))
+     (list
+      #:tests? #f                      ; no tests
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'configure
+            (lambda* (#:key outputs #:allow-other-keys)
+              ;; configure is a perl script which the standard configure phase
+              ;; fails to execute
+              (invoke "./configure"
+                      (string-append "--prefix=" (assoc-ref outputs "out")))))
+          (add-before 'install 'fix-makefile
+            (lambda _
+              (substitute* "Makefile"
+                (("\\$\\(DESTDIR\\)/etc") "$(DESTDIR)$(PREFIX)/etc"))))
+          (add-before 'install 'patch-command-paths
+            ;; Depending on the content of the file to be displayed and some
+            ;; settings, lesspipe trees to use a large variety of external
+            ;; commands, e.g. rpm, dpkg, vimcolor.  We only link the
+            ;; essential ones to avoid this package to pull in all these
+            ;; dependencies which might never ever we used.
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((file (search-input-file inputs "/bin/file"))
+                    (tput (search-input-file inputs "/bin/tput")))
+                (substitute* "sxw2txt"
+                  (("^use warnings;" line)
+                   (string-append
+                    line "\nuse lib '" #$perl-archive-zip
+                    "/lib/perl5/site_perl';")))
+                (substitute* "lesscomplete"
+                  (("file -") (string-append file " -")))
+                (substitute* "lesspipe.sh"
+                  (("tput colors")
+                   (string-append tput " colors"))
+                  (("file -")
+                   (string-append file " -")))))))))
     (inputs
-     (list file ncurses))  ; for tput
+     (list file
+           ncurses  ;; for tput
+           perl-archive-zip))
     (native-inputs (list perl))
     (home-page "https://github.com/wofr06/lesspipe")
     (synopsis "Input filter for less")
-- 
2.30.2

Message #22 received at 53920 <at> debbugs.gnu.org (full text, mbox):

From: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
To: Brice Waegeneire <brice <at> waegenei.re>
Cc: 53920 <at> debbugs.gnu.org
Subject: Re: bug#53920: [PATCH] gnu: lesspipe: Update to 2.02.
Date: Tue, 22 Feb 2022 19:42:43 +0100

Hi Brice,

I'd appreciate your review on version 3 of the patch.

https://issues.guix.gnu.org/issue/53920#5

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel <at> crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Message #25 received at 53920 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
Cc: 53920 <at> debbugs.gnu.org
Subject: Re: bug#53920: [PATCH] gnu: lesspipe: Update to 2.02.
Date: Sun, 27 Feb 2022 23:06:25 +0100

Hi Hartmut,

Hartmut Goebel <h.goebel <at> crazy-compilers.com> skribis:

> * gnu/packages/less.scm (lesspipe): Update to 2.03.
>   [arguments] Use new style. <phases>{configure} Adjust to updated source.
>   {fix-makefile} New phase.
>   {patch-tput-and-file} rename into …
>   {patch-command-paths} this; patch other relevant scripts.
>   [inputs] Add perl-archive-zip.

I haven’t tested it but it looks good to me on the surface.  If it works
for you, please go ahead!

Thanks,
Ludo’.

Message #28 received at 53920 <at> debbugs.gnu.org (full text, mbox):

From: Maxime Devos <maximedevos <at> telenet.be>
To: Hartmut Goebel <h.goebel <at> crazy-compilers.com>, 53920 <at> debbugs.gnu.org
Subject: Re: [bug#53920] [PATCH v3] gnu: lesspipe: Update to 2.03.
Date: Sun, 27 Feb 2022 23:22:27 +0100

[Message part 1 (text/plain, inline)]

Hartmut Goebel schreef op di 22-02-2022 om 19:39 [+0100]:
> +                (substitute* "sxw2txt"
> +                  (("^use warnings;" line)
> +                   (string-append
> +                    line "\nuse lib '" #$perl-archive-zip
> +                    "/lib/perl5/site_perl';")))

To make package transformations work, can #$perl-archive-zip be avoided
here?  Maybe:

(substitute* [...]
  ([...]
   (string-append [...] (assoc-ref inputs "perl-archive-zip") [...])))

Greetings,
Maxime.

[signature.asc (application/pgp-signature, inline)]

Message #31 received at 53920 <at> debbugs.gnu.org (full text, mbox):

From: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
To: Maxime Devos <maximedevos <at> telenet.be>, 53920 <at> debbugs.gnu.org
Subject: Re: [bug#53920] [PATCH v3] gnu: lesspipe: Update to 2.03.
Date: Mon, 28 Feb 2022 09:25:08 +0100

Am 27.02.22 um 23:22 schrieb Maxime Devos:
> To make package transformations work, can #$perl-archive-zip be avoided
> here?  Maybe:
>
> (substitute* [...]
>    ([...]
>     (string-append [...] (assoc-ref inputs "perl-archive-zip") [...])))

FMPOV I can easily change this.

Anyhow, I don't understand, why this is necessary for package 
transformations. I thought g-exps are the way to do it?

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel <at> crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Message #34 received at 53920 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
Cc: 53920 <at> debbugs.gnu.org, Maxime Devos <maximedevos <at> telenet.be>
Subject: Re: [bug#53920] [PATCH v3] gnu: lesspipe: Update to 2.03.
Date: Mon, 28 Feb 2022 10:56:57 +0100

Hello,

Hartmut Goebel <h.goebel <at> crazy-compilers.com> writes:

> Am 27.02.22 um 23:22 schrieb Maxime Devos:
>> To make package transformations work, can #$perl-archive-zip be avoided
>> here?  Maybe:
>>
>> (substitute* [...]
>>    ([...]
>>     (string-append [...] (assoc-ref inputs "perl-archive-zip") [...])))
>
> FMPOV I can easily change this.
>
> Anyhow, I don't understand, why this is necessary for package
> transformations. I thought g-exps are the way to do it?

Actually, I think it should be the higher-level sexp:

  #$(this-package-input "perl-archive-zip")

instead of

  (assoc-ref inputs ...)

To answer your question, this is explained in
<https://guix.gnu.org/fr/blog/2021/the-big-change/>, in "G-expressions
and self-referential records".

Another nitpick: end-of-line comments only need a single semicolon, not
two.

Regards,
-- 
Nicolas Goaziou

Message #37 received at 53920 <at> debbugs.gnu.org (full text, mbox):

From: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
To: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
Cc: 53920 <at> debbugs.gnu.org, Maxime Devos <maximedevos <at> telenet.be>
Subject: Re: [bug#53920] [PATCH v3] gnu: lesspipe: Update to 2.03.
Date: Mon, 28 Feb 2022 13:31:26 +0100

[Message part 1 (text/plain, inline)]

Am 28.02.22 um 10:56 schrieb Nicolas Goaziou:
> Actually, I think it should be the higher-level sexp:
>
>    #$(this-package-input "perl-archive-zip")

How can one know, this one to use?

The blog post is more like a historical story, not a tutorial for 
converting. It uses both

|#~`("--disable-color" ,(string-append "--with-gawk=" #$gawk)))) |

|and|

|#~(list (string-append "--with-gawk=" #$(this-package-input "gawk"))))) |

|The manual seems to mostly use the former way.|

||||

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          |h.goebel <at> crazy-compilers.com                |
|www.crazy-compilers.com  | compilers which you thought are impossible |

[Message part 2 (text/html, inline)]

Message #40 received at 53920 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
Cc: 53920 <at> debbugs.gnu.org, Maxime Devos <maximedevos <at> telenet.be>
Subject: Re: [bug#53920] [PATCH v3] gnu: lesspipe: Update to 2.03.
Date: Mon, 28 Feb 2022 13:50:43 +0100

Hartmut Goebel <h.goebel <at> crazy-compilers.com> writes:

> Am 28.02.22 um 10:56 schrieb Nicolas Goaziou:
>> Actually, I think it should be the higher-level sexp:
>>
>>    #$(this-package-input "perl-archive-zip")
>
> How can one know, this one to use?
>
> The blog post is more like a historical story, not a tutorial for
> converting.

Actually, it is. It a tutorial for converting to the new syntax, with
historical background so you know why you're doing it.

> It uses both
>
> |#~`("--disable-color" ,(string-append "--with-gawk=" #$gawk)))) |
>
> |and|
>
> |#~(list (string-append "--with-gawk=" #$(this-package-input "gawk"))))) |

Yes, it does. The former is an example of what was done before the
change, and the latter is demonstrating what we should now use.

> |The manual seems to mostly use the former way.|

Then this should be fixed.

Regards,

Message #45 received at 53920-close <at> debbugs.gnu.org (full text, mbox):

From: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
To: 53920-close <at> debbugs.gnu.org
Cc: Maxime Devos <maximedevos <at> telenet.be>,
 Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
Subject: Re: [bug#53920] [PATCH v3] gnu: lesspipe: Update to 2.03.
Date: Wed, 2 Mar 2022 21:52:19 +0100

Thanks for the review.

Changed to use #$(this-package-input, updated to 2.04 (which was 
released meanwhile) and pushed as d8e353c11bf1999255a2471b553ce754800b074a

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel <at> crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Previous Next

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