gnu: docbook: Remove leftovers.
docbook-xsl patches are probably remnants from
1f7d94597f1e78776f854eeca46c03a3aded8466.
* gnu/packages/docbook.scm: Remove unused import.
* gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch: Remove.
* gnu/packages/patches/docbook-xsl-support-old-url.patch: Ditto.
* gnu/local.mk: Unregister it.
* gnu/packages/moreutils.scm (moreutils)[native-inputs]: Drop obsolete
comment.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
gnu: docbook-xsl: Add rewrite entries for http.
Refactored 'patch-catalog.xml to reduce code duplication.
The catalog for docbook-xsl hosted on the CDN [1] have entries for the 'http'
scheme yet when building from source only 'https' entries are generated.
Patch the XML catalog to provide them both.
[1]: <https://cdn.docbook.org/release/xsl/current/catalog.xml>
* gnu/packages/docbook.scm (docbook-xsl)[arguments]<#:phases>: Rename
'patch-catalog-xml to 'patch-catalog.xml. Refactor this phase for
deduplication and add 'https' entries.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
gnu: docbook-xml-5.1: Fix URIs in catalog.xml.
* gnu/packages/docbook.scm (docbook-xml-5.1)[source]: Patch version in URI.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
gnu: Add docbook-xml-5.0.1.
* gnu/packages/docbook.xml (docbook-xml-5.0.1): New variable.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
gnu: docbook-xml: Fix installation paths.
Using xml/dtd/docbook as installation path had two problems:
* The paths would conflict in profile, which made it impossible
for two different docbook-xml packages to coexist within the XML_CATALOG_FILES
variable.
* It was technically incorrect since non-DTD schemas were also placed here.
This commit makes docbook-xml use versioned paths instead.
Additionally the store URI for docbook-xml-4.1.2 was adjusted to conform to
RFC8089 as according to RFC1738 the double slash "//" is intended for schemes
that involve the direct use of an IP-based protocol.
* gnu/packages/docbook.scm
(docbook-xml-package, docbook-xml-4.x-package): New procedure.
(docbook-xml): Make docbook-xml an alias for docbook-xml-5.1.
(docbook-xml-5.1): New variable.
(docbook-xml-4.5, docbook-xml-4.4, docbook-xml-4.3, docbook-xml-4.2)
(docbook-xml-4.1.2): Refactor to use docbook-xml-4.x-package procedure.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
gnu: libxslt: Set search-paths for XML and SGML catalogs.
According to xsltproc manpage it supports both XML_CATALOG_FILES and
SGML_CATALOG_FILES for catalog lookup.
Since the native-search-paths field is not thunked,
doing (package-native-search-paths libxslt) can lead to module import cycles
so we define a %libxslt-search-paths variable to avoid this kind of trouble.
* guix/search-paths.scm (%libxslt-search-paths): New variable.
* gnu/packages/xml.scm (libxslt)[native-search-paths]: Set to
%libxslt-search-paths.
* gnu/packages/perl.scm
(perl-app-xml-docbook-builder)[native-search-paths]: Ditto.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
gnu: libxml2: Add $SGML_CATALOG_FILES to native-search-path.
According to the xmllint manpage it also makes use of the SGML_CATALOG_FILES
environment variable.
* gnu/packages/xml.scm (libxml2)[native-search-paths]: Add $SGML_CATALOG_FILES.
Co-authored-by: gemmaro <gemmaro.dev@gmail.com>
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I7b4befe352ba10b7a4e134f0806331b63bb4f855
search-paths: Add $XML_CATALOG_FILES and $SGML_CATALOG_FILES.
These variables are used by some packages for XML/SGML catalog lookups.
* guix/search-paths ($XML_CATALOG_FILES, $SGML_CATALOG_FILES): New variable,
extracted from …
* gnu/packages/xml.scm (libxml2, opensp)[native-search-paths]: … here. Refer
to the variables from (guix search-paths) respectively.
* gnu/packages/perl.scm
(perl-app-xml-docbook-builder)[native-search-paths]: Use $XML_CATALOG_FILES.
* doc/guix.texi (Search Paths): Update documentation to reflect changes.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
build: utils: Raise error in modify-phases upon missing key.
* guix/build/utils.scm (alist-cons-before)
(alist-cons-after): Error with a match failure if the
reference is not found, instead of appending to the alist.
* tests/build-utils.scm: Update tests to match the new behavior.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I3044b101bd06231d5cd55a544ac1009e6ce6f9a0
gnu: git: Install zsh completions and git-prompt.
* gnu/packages/version-control.scm (git)[#:phases]<install-shell-completion>:
Also install git-prompt and zsh _git site function.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I76c45e117715a13db96ef0dda4ad6ea9af3a1882
gnu: git-minimal: Add coreutils and sed to PATH.
Fixes <https://issues.guix.gnu.org/65924>.
* gnu/packages/version-control.scm (git-minimal)
[arguments] <imported-modules>: New field.
<modules>: Augment with (ice-9 match), (ice-9 textual-ports) and (guix
search-paths).
<phases>: Add patch-commands phase.
[inputs]: Add coreutils-minimal and sed.
Reviewed-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
Change-Id: I8e3dbbd24ef7f8fa98a392a36617b07fe632cd15
gnu: git: Invert inheritance relationship.
It's simpler to add features on top of a minimal variant than to remove them,
and helps avoiding mistakenly changing git-minimal, which has many dependents.
* gnu/packages/version-control.scm (git-minimal): Move above git and severe
inheritance. Remove input label. Repatriate most fields from...
(git): ... here. Define as package/inherit to inherit from git-minimal.
Extend minimal values instead of overriding them whole.
Reviewed-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
Change-Id: Ia0ef0e7e4f007c2fafad3550344638b6661a408b
gnu: git: Remove labels and use gexps.
* gnu/packages/version-control.scm (git)
[native-inputs, inputs]: Remove labels.
[arguments]: Use gexps. Use gexp variables input searching procedures where
it makes sense.
Reviewed-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
Change-Id: I1c5d0bb5eb9639342c11af94dca2ae2174496459
gnu: socat: Update to 1.7.4.4.
* gnu/packages/networking.scm (socat): Update to 1.7.4.4.
[inputs]: Add readline for READLINE support.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
gnu: perl-xml-xpath: Update to 1.48.
* gnu/packages/xml.scm (perl-xml-xpath): Update to 1.48.
[native-inputs]: Add perl-test-leaktrace.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
gnu: perl-xml-xpath: Wrap xpath command.
* gnu/packages/xml.scm (perl-xml-xpath)[arguments]: Wrap xpath. Add test for
wrapped xpath.
[description]: Document xpath command presence.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
gnu: %objc++-search-paths: Express using $LIBRARY_PATH.
* gnu/packages/gcc.scm (%objc++-search-paths): Express using $LIBRARY_PATH.
gnu: gccgo-4.9: Express search paths via (guix search-paths) variables.
* gnu/packages/gcc.scm (gccgo-4.9)
[native-search-paths]: Express search paths via (guix search-paths) variables.
gnu: gcc-2.95: Express search paths via (guix search-paths) variables.
* gnu/packages/gcc.scm (gcc-2.95)
[native-search-paths]: Express search paths via (guix search-paths) variables.