guix/guix
3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
Code Issues Releases Wiki Activity

gnu: docbook-xsl-ns: Rename to docbook-xsl-1.79.1 and use gexps.

Browse source 
* gnu/packages/docbook.scm (docbook-xsl-ns): Rename to...
(docbook-xsl-1.79.1): ... this.
[source]: Adjust URL and add a comment.
[arguments]: Use gexps and adjust phases accordingly.
* gnu/packages/gnome.scm (colord)[native-inputs]: Replace docbook-xsl-ns with
docbook-xsl-1.79.1.
This commit is contained in:
Maxim Cournoyer 2022-09-26 14:20:32 -04:00
parent fb6173b7c0
commit 1fe766fbe7
No known key found for this signature in database
GPG key ID: 1260E46482E63562
2 changed files with 42 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gnu/packages/docbook.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Andrew Whatson <whatson@gmail.com>
@ -37,6 +37,7 @@
#:use-module (gnu packages base)
#:use-module (gnu packages web-browsers)
#:use-module (gnu packages xml)
#:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
@ -229,31 +230,34 @@ by no means limited to these applications.) This package provides XML DTDs.")
"This package provides XSL style sheets for DocBook.")
(license (license:x11-style "" "See 'COPYING' file."))))
(define-public docbook-xsl-ns
(define-public docbook-xsl-1.79.1
(package
(name "docbook-xsl-ns")
(name "docbook-xsl")
(version "1.79.1")
(source (origin
(method url-fetch)
;; At the time, the non namespaced version was still the
;; default; our latest docbook-xsl is namespaced, so for
;; consistency preserves this property for older versions too.
(uri (string-append "mirror://sourceforge/docbook/"
name "/" version "/"
name "-" version ".tar.bz2"))
name "-ns/" version "/"
name "-ns-" version ".tar.bz2"))
(sha256
(base32
"170ggf5dgjar65kkn5n33kvjr3pdinpj66nnxfx8b2avw0k91jin"))))
(build-system copy-build-system)
(outputs '("out" "doc"))
(arguments
`(#:phases
(modify-phases %standard-phases
(list
#:phases
#~(modify-phases %standard-phases
;; XXX: The copy-build-system doesn't seem to allow installing to a
;; different output.
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(xml (string-append out "/xml/xsl/" ,name "-" ,version))
(doc (string-append (assoc-ref %outputs "doc")
"/share/doc/" ,name "-" ,version))
(lambda _
(let ((xml (string-append #$output "/xml/xsl/" #$name "-" #$version))
(doc (string-append #$output:doc
"/share/doc/" #$name "-" #$version))
(select-rx (make-regexp
"(\\.xml$|\\.xsl$|\\.dtd$|\\.ent$)")))
;; Install catalog.

2
gnu/packages/gnome.scm
View file

@ -5645,7 +5645,7 @@ output devices.")
(native-inputs
(append
`(("bash-completion" ,bash-completion)
("docbook-xsl-ns" ,docbook-xsl-ns)
("docbook-xsl" ,docbook-xsl-1.79.1)
("gtk-doc" ,gtk-doc/stable)
("libxml2" ,libxml2) ;for XML_CATALOG_FILES
("libxslt" ,libxslt)