From cba041c35d4817f83892e6a49c52fe34dde494d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20B=C3=BChler?=
 <Stunkymonkey@users.noreply.github.com>
Date: Tue, 1 Mar 2022 10:47:32 +0100
Subject: [PATCH] =?UTF-8?q?gitSVN,gitMinimal:=20remove=20appendToName=20to?=
 =?UTF-8?q?=20have=20a=20consistent=20package=20n=E2=80=A6=20(#161390)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 .../version-management/git-and-tools/git/default.nix      | 4 +++-
 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 13da857b790e..6af95d7fe82a 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 47e717465f19..c41db87697d0 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 { };