summaryrefslogtreecommitdiff
path: root/gnu/packages/moreutils.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/moreutils.scm')
-rw-r--r--gnu/packages/moreutils.scm39
1 files changed, 20 insertions, 19 deletions
diff --git a/gnu/packages/moreutils.scm b/gnu/packages/moreutils.scm
index 8738418a21..aaa787c1d9 100644
--- a/gnu/packages/moreutils.scm
+++ b/gnu/packages/moreutils.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016–2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016–2018, 2020–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -19,6 +19,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages moreutils)
+ #:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix l:)
#:use-module (guix packages)
#:use-module (guix download)
@@ -31,7 +32,7 @@
(define-public moreutils
(package
(name "moreutils")
- (version "0.66")
+ (version "0.67")
(source
(origin
(method url-fetch)
@@ -39,7 +40,7 @@
"https://git.joeyh.name/index.cgi/moreutils.git/snapshot/"
name "-" version ".tar.gz"))
(sha256
- (base32 "0k91dvqy3jb070bkmhkdxhi05fr7hqlwpv1nrx329wmgi80rw1yw"))))
+ (base32 "045d2dfvsd4sxxr2i2qvkpgvi912qj9vc4gpc8fb4hr9q912z1q3"))))
(build-system gnu-build-system)
;; For building the manual pages.
(native-inputs
@@ -47,22 +48,22 @@
(inputs
(list perl perl-timedate perl-time-duration))
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'install 'wrap-program
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out")))
- (wrap-program
- (string-append out "/bin/ts")
- `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB")))))))
- (delete 'configure)) ; no configure script
- #:make-flags
- (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
- (string-append "DOCBOOKXSL="
- (assoc-ref %build-inputs "docbook-xsl") "/xml/xsl/"
- ,(package-name docbook-xsl) "-"
- ,(package-version docbook-xsl))
- (string-append "CC=" ,(cc-for-target)))))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'wrap-program
+ (lambda _
+ (wrap-program
+ (string-append #$output "/bin/ts")
+ `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))))
+ (delete 'configure)) ; no configure script
+ #:make-flags
+ #~(list (string-append "PREFIX=" #$output)
+ (string-append "DOCBOOKXSL="
+ #$(this-package-native-input "docbook-xsl")
+ "/xml/xsl/docbook-xsl-"
+ #$(package-version (this-package-native-input
+ "docbook-xsl")))
+ (string-append "CC=" #$(cc-for-target)))))
(home-page "https://joeyh.name/code/moreutils/")
(synopsis "Miscellaneous general-purpose command-line tools")
(description