me
/
guix
Archived
1
0
Fork 0
Code

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.
master
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 © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; 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 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Andrew Whatson <whatson@gmail.com> ;;; Copyright © 2021 Andrew Whatson <whatson@gmail.com>
@ -37,6 +37,7 @@
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages web-browsers) #:use-module (gnu packages web-browsers)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #: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.") "This package provides XSL style sheets for DocBook.")
(license (license:x11-style "" "See 'COPYING' file.")))) (license (license:x11-style "" "See 'COPYING' file."))))
(define-public docbook-xsl-ns (define-public docbook-xsl-1.79.1
(package (package
(name "docbook-xsl-ns") (name "docbook-xsl")
(version "1.79.1") (version "1.79.1")
(source (origin (source (origin
(method url-fetch) (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/" (uri (string-append "mirror://sourceforge/docbook/"
name "/" version "/" name "-ns/" version "/"
name "-" version ".tar.bz2")) name "-ns-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"170ggf5dgjar65kkn5n33kvjr3pdinpj66nnxfx8b2avw0k91jin")))) "170ggf5dgjar65kkn5n33kvjr3pdinpj66nnxfx8b2avw0k91jin"))))
(build-system copy-build-system) (build-system copy-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:phases
#~(modify-phases %standard-phases
;; XXX: The copy-build-system doesn't seem to allow installing to a ;; XXX: The copy-build-system doesn't seem to allow installing to a
;; different output. ;; different output.
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let* ((out (assoc-ref outputs "out")) (let ((xml (string-append #$output "/xml/xsl/" #$name "-" #$version))
(xml (string-append out "/xml/xsl/" ,name "-" ,version)) (doc (string-append #$output:doc
(doc (string-append (assoc-ref %outputs "doc") "/share/doc/" #$name "-" #$version))
"/share/doc/" ,name "-" ,version))
(select-rx (make-regexp (select-rx (make-regexp
"(\\.xml$|\\.xsl$|\\.dtd$|\\.ent$)"))) "(\\.xml$|\\.xsl$|\\.dtd$|\\.ent$)")))
;; Install catalog. ;; Install catalog.

2
gnu/packages/gnome.scm
View File

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