public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #102020 from braunse/use-asciidoctor-for-git-docs

Browse Source 
git: Use asciidoctor instead of asciidoc for manpages
This commit is contained in:
Michael Weiss 2020-10-30 11:27:50 +01:00 committed by GitHub
commit 54ff028ad9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -2,7 +2,7 @@
, curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio
, gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc
, openssh, pcre2 , openssh, pcre2
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , asciidoctor, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xsl_ns, docbook_xml_dtd_45
, libxslt, tcl, tk, makeWrapper, libiconv , libxslt, tcl, tk, makeWrapper, libiconv
, svnSupport, subversionClient, perlLibs, smtpPerlLibs , svnSupport, subversionClient, perlLibs, smtpPerlLibs
, perlSupport ? true , perlSupport ? true
@ -65,8 +65,8 @@ stdenv.mkDerivation {
''; '';
nativeBuildInputs = [ gettext perlPackages.perl ] nativeBuildInputs = [ gettext perlPackages.perl ]
++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x ++ stdenv.lib.optionals withManual [ asciidoctor texinfo xmlto docbook2x
docbook_xsl docbook_xml_dtd_45 libxslt ]; docbook_xsl docbook_xsl_ns docbook_xml_dtd_45 libxslt ];
buildInputs = [curl openssl zlib expat cpio makeWrapper libiconv] buildInputs = [curl openssl zlib expat cpio makeWrapper libiconv]
++ stdenv.lib.optionals perlSupport [ perlPackages.perl ] ++ stdenv.lib.optionals perlSupport [ perlPackages.perl ]
++ stdenv.lib.optionals guiSupport [tcl tk] ++ stdenv.lib.optionals guiSupport [tcl tk]
@ -145,7 +145,7 @@ stdenv.mkDerivation {
} }
# Install git-subtree. # Install git-subtree.
make -C contrib/subtree install ${stdenv.lib.optionalString withManual "install-doc"} make -C contrib/subtree install ${stdenv.lib.optionalString withManual "USE_ASCIIDOCTOR=1 install-doc"}
rm -rf contrib/subtree rm -rf contrib/subtree
# Install contrib stuff. # Install contrib stuff.
@ -230,7 +230,7 @@ stdenv.mkDerivation {
'') '')
+ stdenv.lib.optionalString withManual ''# Install man pages and Info manual + stdenv.lib.optionalString withManual ''# Install man pages and Info manual
make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html install-info \ make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES USE_ASCIIDOCTOR=1 PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html install-info \
-C Documentation '' -C Documentation ''
+ (if guiSupport then '' + (if guiSupport then ''