b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
git: Add a doc output for the HTML and text files
This commit is contained in:
Wout Mertens 2020-05-18 21:28:58 +02:00 committed by GitHub
parent f8a9c6efac 9f2faa1f6f
commit fd05023849
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nixos/doc/manual/release-notes/rl-2009.xml
View file

@ -424,6 +424,11 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
This matches the autotools convention for env vars which standard for these things, making interfacing with other tools easier.
</para>
</listitem>
<listitem>
<para>
Additional Git documentation (HTML and text files) is now available via the <literal>git-doc</literal> package.
</para>
</listitem>
</itemizedlist>
</section>
</section>

8
pkgs/applications/version-management/git-and-tools/default.nix
View file

@ -82,6 +82,14 @@ let
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
git-doc = lib.addMetaAttrs {
description = "Additional documentation for Git";
longDescription = ''
This package contains additional documentation (HTML and text files) that
is referenced in the man pages of Git.
'';
} gitFull.doc;
git-extras = callPackage ./git-extras { };
git-fame = callPackage ./git-fame {};

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View file

@ -36,7 +36,7 @@ stdenv.mkDerivation {
sha256 = "0j685w6pzkn926z5nf5r8fij4ziipvw4c9yb0wc577nzf4j16rbd";
};
outputs = [ "out" ];
outputs = [ "out" "doc" ];
hardeningDisable = [ "format" ];
@ -234,7 +234,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-info \
make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html install-info \
-C Documentation ''
+ (if guiSupport then ''

2
pkgs/top-level/all-packages.nix
View file

@ -19733,7 +19733,7 @@ in
gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {});
inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret git-secrets transcrypt git-crypt ghq;
inherit (gitAndTools) git gitFull gitSVN git-cola git-doc svn2git git-radar git-secret git-secrets transcrypt git-crypt ghq;
gitMinimal = git.override {
withManual = false;