diff options
| author | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/less.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/less.scm')
| -rw-r--r-- | gnu/packages/less.scm | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/gnu/packages/less.scm b/gnu/packages/less.scm index 25b675902a..e23b5d0c24 100644 --- a/gnu/packages/less.scm +++ b/gnu/packages/less.scm @@ -45,7 +45,7 @@ (sha256 (base32 "044fl3izmsi8n1vqzsqdp65q0qyyn5kmsg4sk7id0mxzx15zbbba")))) (build-system gnu-build-system) - (inputs `(("ncurses" ,ncurses))) + (inputs (list ncurses)) (home-page "https://www.gnu.org/software/less/") (synopsis "Paginator for terminals") (description @@ -59,7 +59,7 @@ text editors.") (define-public lesspipe (package (name "lesspipe") - (version "1.89") + (version "1.91") (source (origin (method git-fetch) (uri (git-reference @@ -68,7 +68,7 @@ text editors.") (file-name (git-file-name name version)) (sha256 (base32 - "0lxf0m4bgwhpwmwa5q2vklk31yhiaz049kpm4n2hqiyb5mlpa94a")))) + "04dqvq6j4h451xqbvxzv6pv679hzzfm39pdm5vg7h3r45gzg0kps")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests @@ -79,22 +79,19 @@ text editors.") (delete-file "Makefile") ; force generating (invoke "./configure" (string-append "--prefix=" out) - "--yes") - #t))) + "--yes")))) (add-before 'install 'patch-tput-and-file (lambda* (#:key inputs #:allow-other-keys) (substitute* "lesspipe.sh" (("tput colors") - (string-append (assoc-ref inputs "ncurses") - "/bin/tput colors")) + (string-append (search-input-file inputs "/bin/tput") + " colors")) (("file -") - (string-append (assoc-ref inputs "file") - "/bin/file -"))) - #t))))) + (string-append (search-input-file inputs "/bin/file") + " -")))))))) (inputs - `(("file" ,file) - ("ncurses" ,ncurses))) ; for tput - (native-inputs `(("perl" ,perl))) + (list file ncurses)) ; for tput + (native-inputs (list perl)) (home-page "https://github.com/wofr06/lesspipe") (synopsis "Input filter for less") (description "To browse files, the excellent viewer @code{less} can be |