diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-06-22 18:48:00 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-06-22 18:48:00 +0200 |
| commit | 8655a714457dbf1cde45979507012d9515614028 (patch) | |
| tree | 7712625328f45794ccda9baa730a4825bb2efb47 /gnu/packages/docbook.scm | |
| parent | a589049e141588ebcf4079116e378d60b779f6b4 (diff) | |
| parent | 2af3f5eef045f7d177cc394c89be069bac895688 (diff) | |
| download | guix-8655a714457dbf1cde45979507012d9515614028.tar guix-8655a714457dbf1cde45979507012d9515614028.tar.gz | |
Merge branch master into core-updates
Diffstat (limited to 'gnu/packages/docbook.scm')
| -rw-r--r-- | gnu/packages/docbook.scm | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 5ee6fcccde..91a5e55887 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -372,17 +372,18 @@ for DocBook.") (description "Documentation for the DocBook DSSSL style sheets.") (license (license:non-copyleft "file://doc/LEGALNOTICE.htm")))) -(define-public docbook-sgml +(define-public docbook-sgml-4.2 (package (name "docbook-sgml") - (version "4.1") + (version "4.2") (source (origin (method url-fetch) - (uri (string-append "https://www.oasis-open.org/docbook/sgml/" - version "/docbk41.zip")) + (uri (string-append + "https://www.oasis-open.org/docbook/sgml/4.2/docbook-" + version ".zip")) (sha256 (base32 - "04b3gp4zkh9c5g9kvnywdkdfkcqx3kjc04j4mpkr4xk7lgqgrany")))) + "1hrm4qmmzi285bkxkc74lxvjvw2gbl7ycbaxhv31h9rl9g4x5sv7")))) (build-system trivial-build-system) (arguments '(#:modules ((guix build utils)) @@ -403,8 +404,8 @@ for DocBook.") ;; Reference the ISO 8879 character entities. ;; e.g. "iso-lat1.gml" --> "<iso-entities-dir>/ISOlat1" (substitute* "docbook.cat" - (("(.*ISO 8879.*)\"iso-(.*)\\.gml\"" _ head name) - (string-append head "\"" iso-entities-dir "/ISO" name "\""))))))) + (("\"iso-(.*)\\.gml\"" _ name) + (string-append "\"" iso-entities-dir "/ISO" name "\""))))))) (native-inputs (list unzip)) (inputs @@ -414,6 +415,20 @@ for DocBook.") (description "This package provides SGML style sheets for DocBook.") (license (license:x11-style "" "See file headers.")))) +(define-public docbook-sgml-4.1 + (package + (inherit docbook-sgml-4.2) + (version "4.1") + (source (origin + (method url-fetch) + (uri (string-append "https://www.oasis-open.org/docbook/sgml/" + version "/docbk41.zip")) + (sha256 + (base32 + "04b3gp4zkh9c5g9kvnywdkdfkcqx3kjc04j4mpkr4xk7lgqgrany")))))) + +(define-public docbook-sgml docbook-sgml-4.1) + (define-public docbook-sgml-3.1 (package (inherit docbook-sgml) |