diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-26 14:20:32 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-27 10:05:54 -0400 |
commit | 1fe766fbe75330f96d9bec8ab8c86385fa68d1c9 (patch) | |
tree | b8510eec4602e9a489e37959447c4eab01ea26fb /gnu/packages | |
parent | fb6173b7c0aab02efdf15bfc9a00791f77a8b04f (diff) |
gnu: docbook-xsl-ns: Rename to docbook-xsl-1.79.1 and use gexps.
* 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.
Diffstat (limited to 'gnu/packages')
-rw-r--r-- | gnu/packages/docbook.scm | 78 | ||||
-rw-r--r-- | gnu/packages/gnome.scm | 2 |
2 files changed, 42 insertions, 38 deletions
diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index ae0ea07dbf..1218d8c6ed 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -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,55 +230,58 @@ 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 - ;; 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)) + (list + #:phases + #~(modify-phases %standard-phases + ;; XXX: The copy-build-system doesn't seem to allow installing to a + ;; different output. + (replace 'install + (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. - (install-file "catalog.xml" xml) - (install-file "VERSION.xsl" xml) - (substitute* (string-append xml "/catalog.xml") - (("rewritePrefix=\"./") - (string-append "rewritePrefix=\"file://" xml "/"))) - ;; Install style sheets. - (for-each (lambda (dir) - (for-each (lambda (f) - (install-file - f (string-append xml "/" (dirname f)))) - (find-files dir select-rx))) - '("assembly" "common" "eclipse" "epub" "epub3" "fo" - "highlighting" "html" "htmlhelp" "javahelp" "lib" - "manpages" "params" "profiling" "roundtrip" - "template" "website" - "xhtml" "xhtml-1_1" "xhtml5")) - ;; Install documentation. - (install-file "NEWS" doc) - (install-file "RELEASE-NOTES.html" doc) - (copy-recursively "slides" doc) - (copy-recursively "webhelp" doc))))))) + ;; Install catalog. + (install-file "catalog.xml" xml) + (install-file "VERSION.xsl" xml) + (substitute* (string-append xml "/catalog.xml") + (("rewritePrefix=\"./") + (string-append "rewritePrefix=\"file://" xml "/"))) + ;; Install style sheets. + (for-each (lambda (dir) + (for-each (lambda (f) + (install-file + f (string-append xml "/" (dirname f)))) + (find-files dir select-rx))) + '("assembly" "common" "eclipse" "epub" "epub3" "fo" + "highlighting" "html" "htmlhelp" "javahelp" "lib" + "manpages" "params" "profiling" "roundtrip" + "template" "website" + "xhtml" "xhtml-1_1" "xhtml5")) + ;; Install documentation. + (install-file "NEWS" doc) + (install-file "RELEASE-NOTES.html" doc) + (copy-recursively "slides" doc) + (copy-recursively "webhelp" doc))))))) (home-page "https://docbook.org") (synopsis "DocBook XSL namespaced style sheets for document authoring") (description "This package provides the @emph{namespaced} XSL style sheets diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5761475c88..c15d119b5c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -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) |