diff options
| author | pennae <82953136+pennae@users.noreply.github.com> | 2023-06-19 14:05:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-19 14:05:03 +0200 |
| commit | c8b4e5d557c997c441f67a7fc6960c21f76298ab (patch) | |
| tree | ac7fe5f263b4d61886f9434964b6f3232eac04e7 /pkgs/data | |
| parent | f2eabf314bf77dfc44a225cdacbf8edb5a411fbc (diff) | |
| parent | 3e7649f01be8b7a4295bd414e6cb905affff7d66 (diff) | |
| download | nixlib-c8b4e5d557c997c441f67a7fc6960c21f76298ab.tar nixlib-c8b4e5d557c997c441f67a7fc6960c21f76298ab.tar.gz nixlib-c8b4e5d557c997c441f67a7fc6960c21f76298ab.tar.bz2 nixlib-c8b4e5d557c997c441f67a7fc6960c21f76298ab.tar.lz nixlib-c8b4e5d557c997c441f67a7fc6960c21f76298ab.tar.xz nixlib-c8b4e5d557c997c441f67a7fc6960c21f76298ab.tar.zst nixlib-c8b4e5d557c997c441f67a7fc6960c21f76298ab.zip | |
Merge pull request #237557 from pennae/dedocbookify-nixos
nixos/doc: dedocbookify
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/fix-man-options-duplication.patch | 11 |
2 files changed, 1 insertions, 16 deletions
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index 2f9d22e57d89..735dfdb4f81b 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, substituteAll, fetchurl, fetchpatch, findXMLCatalogs, writeScriptBin, ruby, bash, withManOptDedupPatch ? false }: +{ lib, stdenv, substituteAll, fetchurl, fetchpatch, findXMLCatalogs, writeScriptBin, ruby, bash }: let @@ -36,10 +36,6 @@ let src = ./catalog-legacy-uris.patch; inherit legacySuffix suffix version; }) - ] ++ lib.optionals withManOptDedupPatch [ - # Fixes https://github.com/NixOS/nixpkgs/issues/166304 - # https://github.com/docbook/xslt10-stylesheets/pull/241 - ./fix-man-options-duplication.patch ]; propagatedBuildInputs = [ findXMLCatalogs ]; diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/fix-man-options-duplication.patch b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/fix-man-options-duplication.patch deleted file mode 100644 index 304d9781e6aa..000000000000 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/fix-man-options-duplication.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/manpages/lists.xsl -+++ b/manpages/lists.xsl -@@ -110,7 +110,7 @@ - <xsl:text>.RE </xsl:text> - </xsl:template> - --<xsl:template match="d:varlistentry/d:term"/> -+<xsl:template match="d:varlistentry/d:term" priority="1"/> - <xsl:template match="d:glossentry/d:glossterm"/> - - <xsl:template match="d:variablelist[ancestor::d:listitem or ancestor::d:step or ancestor::d:glossdef]| |