diff options
author | Felix Bühler <Stunkymonkey@users.noreply.github.com> | 2022-03-01 10:47:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-01 10:47:32 +0100 |
commit | cba041c35d4817f83892e6a49c52fe34dde494d7 (patch) | |
tree | 366ed0dedbd5715ea73d5825f86fb8ba69635b7f /pkgs | |
parent | 64a89aac8618561eb2ff3e2e5b9986294ac7f2b2 (diff) | |
download | nixpkgs-cba041c35d4817f83892e6a49c52fe34dde494d7.tar nixpkgs-cba041c35d4817f83892e6a49c52fe34dde494d7.tar.gz nixpkgs-cba041c35d4817f83892e6a49c52fe34dde494d7.tar.bz2 nixpkgs-cba041c35d4817f83892e6a49c52fe34dde494d7.tar.lz nixpkgs-cba041c35d4817f83892e6a49c52fe34dde494d7.tar.xz nixpkgs-cba041c35d4817f83892e6a49c52fe34dde494d7.tar.zst nixpkgs-cba041c35d4817f83892e6a49c52fe34dde494d7.zip |
gitSVN,gitMinimal: remove appendToName to have a consistent package n… (#161390)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
2 files changed, 6 insertions, 6 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 13da857b790..6af95d7fe82 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -32,7 +32,9 @@ let in stdenv.mkDerivation { - pname = "git"; + pname = "git" + + lib.optionalString svnSupport "-with-svn" + + lib.optionalString (!svnSupport && !guiSupport && !sendEmailSupport && !withManual && !pythonSupport && !withpcre2) "-minimal"; inherit version; src = fetchurl { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47e717465f1..c41db87697d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25996,9 +25996,7 @@ with pkgs; }; # Git with SVN support, but without GUI. - gitSVN = lowPrio (appendToName "with-svn" (git.override { - svnSupport = true; - })); + gitSVN = lowPrio (git.override { svnSupport = true; }); git-doc = lib.addMetaAttrs { description = "Additional documentation for Git"; @@ -26008,11 +26006,11 @@ with pkgs; ''; } gitFull.doc; - gitMinimal = appendToName "minimal" (git.override { + gitMinimal = git.override { withManual = false; pythonSupport = false; withpcre2 = false; - }); + }; gitRepo = callPackage ../applications/version-management/git-repo { }; |