Merge pull request #86848 from primeos/git-add-doc-output

git: Add a doc output for the HTML and text files

authored by

Wout Mertens and committed by
GitHub
fd050238 f8a9c6ef

+16 -3
+5
nixos/doc/manual/release-notes/rl-2009.xml
··· 424 424 This matches the autotools convention for env vars which standard for these things, making interfacing with other tools easier. 425 425 </para> 426 426 </listitem> 427 + <listitem> 428 + <para> 429 + Additional Git documentation (HTML and text files) is now available via the <literal>git-doc</literal> package. 430 + </para> 431 + </listitem> 427 432 </itemizedlist> 428 433 </section> 429 434 </section>
+8
pkgs/applications/version-management/git-and-tools/default.nix
··· 82 82 inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; 83 83 }; 84 84 85 + git-doc = lib.addMetaAttrs { 86 + description = "Additional documentation for Git"; 87 + longDescription = '' 88 + This package contains additional documentation (HTML and text files) that 89 + is referenced in the man pages of Git. 90 + ''; 91 + } gitFull.doc; 92 + 85 93 git-extras = callPackage ./git-extras { }; 86 94 87 95 git-fame = callPackage ./git-fame {};
+2 -2
pkgs/applications/version-management/git-and-tools/git/default.nix
··· 36 36 sha256 = "0j685w6pzkn926z5nf5r8fij4ziipvw4c9yb0wc577nzf4j16rbd"; 37 37 }; 38 38 39 - outputs = [ "out" ]; 39 + outputs = [ "out" "doc" ]; 40 40 41 41 hardeningDisable = [ "format" ]; 42 42 ··· 234 234 '') 235 235 236 236 + stdenv.lib.optionalString withManual ''# Install man pages and Info manual 237 - make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-info \ 237 + make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html install-info \ 238 238 -C Documentation '' 239 239 240 240 + (if guiSupport then ''
+1 -1
pkgs/top-level/all-packages.nix
··· 19733 19733 19734 19734 gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {}); 19735 19735 19736 - inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret git-secrets transcrypt git-crypt ghq; 19736 + inherit (gitAndTools) git gitFull gitSVN git-cola git-doc svn2git git-radar git-secret git-secrets transcrypt git-crypt ghq; 19737 19737 19738 19738 gitMinimal = git.override { 19739 19739 withManual = false;