diff options
Diffstat (limited to 'gnu/packages/moreutils.scm')
| -rw-r--r-- | gnu/packages/moreutils.scm | 50 |
1 files changed, 23 insertions, 27 deletions
diff --git a/gnu/packages/moreutils.scm b/gnu/packages/moreutils.scm index 47bda32126..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,10 +19,12 @@ ;;; 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) #:use-module (guix build-system gnu) + #:use-module (guix utils) #:use-module (gnu packages perl) #:use-module (gnu packages xml) #:use-module (gnu packages docbook)) @@ -30,7 +32,7 @@ (define-public moreutils (package (name "moreutils") - (version "0.65") + (version "0.67") (source (origin (method url-fetch) @@ -38,36 +40,30 @@ "https://git.joeyh.name/index.cgi/moreutils.git/snapshot/" name "-" version ".tar.gz")) (sha256 - (base32 "10c8b4bwnli4gxwvgmgkc5kin1ksrxsnxmigs7y4rrh4aaszdjb0")))) + (base32 "045d2dfvsd4sxxr2i2qvkpgvi912qj9vc4gpc8fb4hr9q912z1q3")))) (build-system gnu-build-system) ;; For building the manual pages. (native-inputs - `(("docbook-xml" ,docbook-xml-4.4) - ("docbook-xsl" ,docbook-xsl) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt))) + (list docbook-xml-4.4 docbook-xsl libxml2 libxslt)) (inputs - `(("perl" ,perl) - ("perl-timedate" ,perl-timedate) - ("perl-time-duration" ,perl-time-duration))) + (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"))))) - #t)) - (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)) - "CC=gcc"))) + (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 |