diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-06-10 16:13:48 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-06-10 16:13:48 +0200 |
| commit | a5f5d020c69c22ddc6be48123ef4d30fd262c403 (patch) | |
| tree | bfb79b323b549e1f10a94d0153fdd3761ae893a6 /pkgs/applications/version-management/git-and-tools | |
| parent | ed43d951af1030d01e22fe0aaaed568af4e7e8e9 (diff) | |
| parent | bbe71613b6e656e707acdf9c279736c900bf4e87 (diff) | |
| download | nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.gz nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.bz2 nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.lz nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.xz nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.zst nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.zip | |
Merge branch 'staging-next'
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 7043f7247184..f9ebbabd11b2 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -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 {}; 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 9c1a01f42ae8..78981ef9ad0f 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { sha256 = "0j685w6pzkn926z5nf5r8fij4ziipvw4c9yb0wc577nzf4j16rbd"; }; - outputs = [ "out" ]; + outputs = [ "out" ] ++ stdenv.lib.optional withManual "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 '' |