diff options
author | Sebastien Braun <sebastien@sebbraun.de> | 2020-10-29 09:17:13 +0100 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2020-10-30 10:48:33 +0100 |
commit | bbf96d898b96ea2d1ff19a09e545499e4f32d8d0 (patch) | |
tree | 38a613773a44aff9ceca88f794b03f7530f43ec3 /pkgs/applications/version-management/git-and-tools/git | |
parent | 7db5cb9bf618f9bf93697b66e9ad11480039b3e8 (diff) | |
download | nixpkgs-bbf96d898b96ea2d1ff19a09e545499e4f32d8d0.tar nixpkgs-bbf96d898b96ea2d1ff19a09e545499e4f32d8d0.tar.gz nixpkgs-bbf96d898b96ea2d1ff19a09e545499e4f32d8d0.tar.bz2 nixpkgs-bbf96d898b96ea2d1ff19a09e545499e4f32d8d0.tar.lz nixpkgs-bbf96d898b96ea2d1ff19a09e545499e4f32d8d0.tar.xz nixpkgs-bbf96d898b96ea2d1ff19a09e545499e4f32d8d0.tar.zst nixpkgs-bbf96d898b96ea2d1ff19a09e545499e4f32d8d0.zip |
git: Use asciidoctor instead of asciidoc for manpages
Asciidoc is severely outdated and is replaced by asciidoctor. Eliminating asciidoc gets rid of a python2 dependency, see https://github.com/NixOS/nixpkgs/issues/101964
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools/git')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index c54a9160f6d..e40debf76c0 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -2,7 +2,7 @@ , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc , 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 , svnSupport, subversionClient, perlLibs, smtpPerlLibs , perlSupport ? true @@ -65,8 +65,8 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ gettext perlPackages.perl ] - ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x - docbook_xsl docbook_xml_dtd_45 libxslt ]; + ++ stdenv.lib.optionals withManual [ asciidoctor texinfo xmlto docbook2x + docbook_xsl docbook_xsl_ns docbook_xml_dtd_45 libxslt ]; buildInputs = [curl openssl zlib expat cpio makeWrapper libiconv] ++ stdenv.lib.optionals perlSupport [ perlPackages.perl ] ++ stdenv.lib.optionals guiSupport [tcl tk] @@ -145,7 +145,7 @@ stdenv.mkDerivation { } # 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 # Install contrib stuff. @@ -230,7 +230,7 @@ stdenv.mkDerivation { '') + 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 '' + (if guiSupport then '' |