diff options
| author | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/less.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/less.scm')
| -rw-r--r-- | gnu/packages/less.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/packages/less.scm b/gnu/packages/less.scm index 1057dc2909..25b675902a 100644 --- a/gnu/packages/less.scm +++ b/gnu/packages/less.scm @@ -1,8 +1,8 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov <[email protected]> -;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <[email protected]> +;;; Copyright © 2019–2021 Tobias Geerinckx-Rice <[email protected]> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <[email protected]> -;;; Copyright © 2020 Michael Rohleder <[email protected]> +;;; Copyright © 2020, 2021 Michael Rohleder <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,7 +33,7 @@ (define-public less (package (name "less") - (version "563") + (version "590") (source (origin (method url-fetch) @@ -43,7 +43,7 @@ version ".tar.gz"))) (patches (search-patches "less-hurd-path-max.patch")) (sha256 - (base32 "16lsvk88vwjwp5ax1wnll44wxwnzs8lb2fn90xx2si64kwmnsnyf")))) + (base32 "044fl3izmsi8n1vqzsqdp65q0qyyn5kmsg4sk7id0mxzx15zbbba")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses))) (home-page "https://www.gnu.org/software/less/") @@ -59,7 +59,7 @@ text editors.") (define-public lesspipe (package (name "lesspipe") - (version "1.85") + (version "1.89") (source (origin (method git-fetch) (uri (git-reference @@ -68,7 +68,7 @@ text editors.") (file-name (git-file-name name version)) (sha256 (base32 - "1v1jdkdq1phc93gdr6mjlk98gipxrkkq4bj8kks0kfdvjgdwkdaa")))) + "0lxf0m4bgwhpwmwa5q2vklk31yhiaz049kpm4n2hqiyb5mlpa94a")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests |