ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 13:28:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: moreutils: Update to 5.9.

Browse source 
* gnu/packages/moreutils.scm (moreutils): Update to 5.9.
[source]: Update the fall-back Debian snapshot URL.
[inputs]: Move docbook-xml, docbook-xsl, libxml2, and libxslt from here...
[native-inputs]: ...to this new variable.
[arguments]: Delete the configure phase altogether.  Set the DOCBOOKXSL path
in #:make-flags instead.
[home-page]: Use HTTPS.
This commit is contained in:
Tobias Geerinckx-Rice 2016-12-24 03:19:00 +01:00
parent 4d2fd1c016
commit b672e1ed1e
No known key found for this signature in database
GPG key ID: 91CCDB9B48541B99
1 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
gnu/packages/moreutils.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -29,43 +30,42 @@ (define-module (gnu packages moreutils)
(define-public moreutils (define-public moreutils
(package (package
(name "moreutils") (name "moreutils")
(version "0.58") (version "0.59")
(source (origin (source
(method url-fetch) (origin
(uri (list (method url-fetch)
(string-append (uri (list
"mirror://debian/pool/main/m/moreutils/moreutils_" (string-append
version ".orig.tar.gz") "mirror://debian/pool/main/m/moreutils/moreutils_"
;; The main Debian mirrors only hold the current packages version ".orig.tar.gz")
(string-append ;; The main Debian mirrors only hold the current packages.
"http://snapshot.debian.org/archive/debian/20160304T165744Z" (string-append
"/pool/main/m/moreutils/moreutils_0.58.orig.tar.gz"))) "http://snapshot.debian.org/archive/debian/20161223T212806Z"
(sha256 "/pool/main/m/moreutils/moreutils_0.59.orig.tar.gz")))
(base32 (sha256
"02n00vqp6jxbxr5v3rdjxmzp6kxxjdkjgcclam6wrw8qamsbljww")))) (base32
"1d6ik3j4lwp90vb93p7yv60k6vk2chz448d1z9xrmxvv371i33m4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("perl" ,perl) ;; For building the manual pages.
("libxml2" ,libxml2) (native-inputs
("libxslt" ,libxslt) `(("docbook-xml" ,docbook-xml-4.4)
("docbook-xml" ,docbook-xml-4.4) ("docbook-xsl" ,docbook-xsl)
("docbook-xsl" ,docbook-xsl))) ("libxml2" ,libxml2)
("libxslt" ,libxslt)))
(inputs
`(("perl" ,perl)))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (delete 'configure)) ; no configure script
(lambda* (#:key inputs #:allow-other-keys)
(use-modules (srfi srfi-1))
(substitute* "Makefile"
(("/usr/share/xml/.*/docbook.xsl")
(let* ((docbook-xsl (assoc-ref inputs "docbook-xsl"))
(files (find-files docbook-xsl "^docbook\\.xsl$")))
(find (lambda (file)
(string-suffix? "/manpages/docbook.xsl" file))
files)))))))
#:make-flags #:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out")) (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"))) "CC=gcc")))
(home-page "http://joeyh.name/code/moreutils/") (home-page "https://joeyh.name/code/moreutils/")
(synopsis "Miscellaneous general-purpose command-line tools") (synopsis "Miscellaneous general-purpose command-line tools")
(description (description
"Moreutils is a collection of general-purpose command-line tools to "Moreutils is a collection of general-purpose command-line tools to