diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2020-05-18 16:50:14 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2020-05-18 16:53:13 +0200 |
| commit | 9f2faa1f6f14b977e4b91523b6c2621bb77f7b62 (patch) | |
| tree | b5364905e21a1a86d9d24182193ad95fb193dd48 | |
| parent | 54918d6366fd6b2946b869f2f5a0645e5477c859 (diff) | |
| download | nixlib-9f2faa1f6f14b977e4b91523b6c2621bb77f7b62.tar nixlib-9f2faa1f6f14b977e4b91523b6c2621bb77f7b62.tar.gz nixlib-9f2faa1f6f14b977e4b91523b6c2621bb77f7b62.tar.bz2 nixlib-9f2faa1f6f14b977e4b91523b6c2621bb77f7b62.tar.lz nixlib-9f2faa1f6f14b977e4b91523b6c2621bb77f7b62.tar.xz nixlib-9f2faa1f6f14b977e4b91523b6c2621bb77f7b62.tar.zst nixlib-9f2faa1f6f14b977e4b91523b6c2621bb77f7b62.zip | |
git-doc: init
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2009.xml | 5 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 0ed440d79c63..a6c3c2033c38 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -391,6 +391,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> diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index c591ef554ee4..48fa002463b3 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 680177a2610a..7df73a2ec1c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19720,7 +19720,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; |