treewide: remove git-and-tools directory

We do not use a "plugin system" for Git addons anymore, and therefore this
directory is no longer useful. Indeed that directory is way more confusing,
given that it includes more than mere Git addons, going from Bitbucket server
command-line tools to complete rewrites of Git in exotic programming languages.

Also, without this directory, the mental load of decision-making reduces a lot.
When anyone is interested in including a new git-related tool, just put it into
pkgs/applications/version-management, without apologies.

147 files changed, 131 insertions, 131 deletions

diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/bfg-repo-cleaner/default.nix
index a759c1e860051..a759c1e860051 100644
--- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
+++ b/pkgs/applications/version-management/bfg-repo-cleaner/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/bit/default.nix b/pkgs/applications/version-management/bit/default.nix
index c3524417829e9..c3524417829e9 100644
--- a/pkgs/applications/version-management/git-and-tools/bit/default.nix
+++ b/pkgs/applications/version-management/bit/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile b/pkgs/applications/version-management/bitbucket-server-cli/Gemfile
index 8ed3251547116..8ed3251547116 100644
--- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile
+++ b/pkgs/applications/version-management/bitbucket-server-cli/Gemfile
diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock b/pkgs/applications/version-management/bitbucket-server-cli/Gemfile.lock
index 27a6e2c8dd03a..27a6e2c8dd03a 100644
--- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock
+++ b/pkgs/applications/version-management/bitbucket-server-cli/Gemfile.lock
diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix b/pkgs/applications/version-management/bitbucket-server-cli/default.nix
index ecbe064826c5f..ecbe064826c5f 100644
--- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix
+++ b/pkgs/applications/version-management/bitbucket-server-cli/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix b/pkgs/applications/version-management/bitbucket-server-cli/gemset.nix
index 844291b09054d..844291b09054d 100644
--- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix
+++ b/pkgs/applications/version-management/bitbucket-server-cli/gemset.nix
diff --git a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix b/pkgs/applications/version-management/bump2version/default.nix
index ffb9455bd19f9..ffb9455bd19f9 100644
--- a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix
+++ b/pkgs/applications/version-management/bump2version/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/common.nix b/pkgs/applications/version-management/cgit/common.nix
index 0cbc04b7bcc23..0cbc04b7bcc23 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/common.nix
+++ b/pkgs/applications/version-management/cgit/common.nix
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/cgit/default.nix
index f6a0af102303b..f6a0af102303b 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/cgit/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/pink.nix b/pkgs/applications/version-management/cgit/pink.nix
index 73523a2d77afd..73523a2d77afd 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/pink.nix
+++ b/pkgs/applications/version-management/cgit/pink.nix
diff --git a/pkgs/applications/version-management/git-and-tools/conform/default.nix b/pkgs/applications/version-management/conform/default.nix
index 67741d55ceb22..67741d55ceb22 100644
--- a/pkgs/applications/version-management/git-and-tools/conform/default.nix
+++ b/pkgs/applications/version-management/conform/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/darcs-to-git/default.nix
index 895e4610f4fc0..895e4610f4fc0 100644
--- a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
+++ b/pkgs/applications/version-management/darcs-to-git/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/delta/default.nix
index 1bdd028d8101b..1bdd028d8101b 100644
--- a/pkgs/applications/version-management/git-and-tools/delta/default.nix
+++ b/pkgs/applications/version-management/delta/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/diff-so-fancy/default.nix
index 0d346e3598d44..0d346e3598d44 100644
--- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
+++ b/pkgs/applications/version-management/diff-so-fancy/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/fast-export/default.nix
index 9d726795c6200..9d726795c6200 100644
--- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
+++ b/pkgs/applications/version-management/fast-export/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gex/default.nix b/pkgs/applications/version-management/gex/default.nix
index dbcc63419b750..dbcc63419b750 100644
--- a/pkgs/applications/version-management/git-and-tools/gex/default.nix
+++ b/pkgs/applications/version-management/gex/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gfold/default.nix b/pkgs/applications/version-management/gfold/default.nix
index 88fa12ae12ade..88fa12ae12ade 100644
--- a/pkgs/applications/version-management/git-and-tools/gfold/default.nix
+++ b/pkgs/applications/version-management/gfold/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gg/default.nix b/pkgs/applications/version-management/gg/default.nix
index 032c461a74ce8..032c461a74ce8 100644
--- a/pkgs/applications/version-management/git-and-tools/gg/default.nix
+++ b/pkgs/applications/version-management/gg/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/gh/default.nix
index 7d5a9cc6d6089..7d5a9cc6d6089 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/gh/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/ghorg/default.nix
index 22d9ada544c85..22d9ada544c85 100644
--- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix
+++ b/pkgs/applications/version-management/ghorg/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/ghq/default.nix
index 26632abe4694b..26632abe4694b 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix
+++ b/pkgs/applications/version-management/ghq/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/ghr/default.nix b/pkgs/applications/version-management/ghr/default.nix
index fd433bbfc581e..fd433bbfc581e 100644
--- a/pkgs/applications/version-management/git-and-tools/ghr/default.nix
+++ b/pkgs/applications/version-management/ghr/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix
index d80e481bd5bfb..d80e481bd5bfb 100644
--- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
+++ b/pkgs/applications/version-management/git-absorb/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-aggregator/default.nix b/pkgs/applications/version-management/git-aggregator/default.nix
index 9b2465366f672..9b2465366f672 100644
--- a/pkgs/applications/version-management/git-and-tools/git-aggregator/default.nix
+++ b/pkgs/applications/version-management/git-aggregator/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-annex-metadata-gui/default.nix
index 4d57820c84eb6..4d57820c84eb6 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
+++ b/pkgs/applications/version-management/git-annex-metadata-gui/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix b/pkgs/applications/version-management/git-annex-remote-dbx/default.nix
index addfd1f5041b1..addfd1f5041b1 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix
+++ b/pkgs/applications/version-management/git-annex-remote-dbx/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix b/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix
index 16c5b49406f67..16c5b49406f67 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix
+++ b/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-annex-remote-rclone/default.nix
index e05bed928889d..e05bed928889d 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
+++ b/pkgs/applications/version-management/git-annex-remote-rclone/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix b/pkgs/applications/version-management/git-annex-utils/default.nix
index 07af33951dfb4..07af33951dfb4 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix
+++ b/pkgs/applications/version-management/git-annex-utils/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix b/pkgs/applications/version-management/git-appraise/default.nix
index 8b5844fb76ce9..8b5844fb76ce9 100644
--- a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix
+++ b/pkgs/applications/version-management/git-appraise/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-backup/default.nix b/pkgs/applications/version-management/git-backup/default.nix
index 8c45fdef3f7d7..8c45fdef3f7d7 100644
--- a/pkgs/applications/version-management/git-and-tools/git-backup/default.nix
+++ b/pkgs/applications/version-management/git-backup/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-big-picture/default.nix
index decd3c51a392f..decd3c51a392f 100644
--- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
+++ b/pkgs/applications/version-management/git-big-picture/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix b/pkgs/applications/version-management/git-branchless/default.nix
index 1a961b422b249..1a961b422b249 100644
--- a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix
+++ b/pkgs/applications/version-management/git-branchless/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-bug/default.nix
index b85681a73cd94..b85681a73cd94 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
+++ b/pkgs/applications/version-management/git-bug/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix b/pkgs/applications/version-management/git-chglog/default.nix
index b427acf960ec7..b427acf960ec7 100644
--- a/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix
+++ b/pkgs/applications/version-management/git-chglog/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix b/pkgs/applications/version-management/git-cinnabar/default.nix
index 42a22f4866239..42a22f4866239 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix
+++ b/pkgs/applications/version-management/git-cinnabar/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix
index efc12299f941d..efc12299f941d 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix
+++ b/pkgs/applications/version-management/git-cliff/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-codeowners/default.nix
index 862461827eb17..862461827eb17 100644
--- a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
+++ b/pkgs/applications/version-management/git-codeowners/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix b/pkgs/applications/version-management/git-codereview/default.nix
index af641d241b849..af641d241b849 100644
--- a/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix
+++ b/pkgs/applications/version-management/git-codereview/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-cola/default.nix
index 07d36cba891b1..07d36cba891b1 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-cola/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-crecord/default.nix b/pkgs/applications/version-management/git-crecord/default.nix
index 1ad75e75b7bfd..1ad75e75b7bfd 100644
--- a/pkgs/applications/version-management/git-and-tools/git-crecord/default.nix
+++ b/pkgs/applications/version-management/git-crecord/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-credential-1password/default.nix b/pkgs/applications/version-management/git-credential-1password/default.nix
index 8d180f5176a2e..8d180f5176a2e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-credential-1password/default.nix
+++ b/pkgs/applications/version-management/git-credential-1password/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-credential-keepassxc/default.nix b/pkgs/applications/version-management/git-credential-keepassxc/default.nix
index 27998f1c9c15b..27998f1c9c15b 100644
--- a/pkgs/applications/version-management/git-and-tools/git-credential-keepassxc/default.nix
+++ b/pkgs/applications/version-management/git-credential-keepassxc/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-crypt/default.nix
index 49dcb14fc0139..49dcb14fc0139 100644
--- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
+++ b/pkgs/applications/version-management/git-crypt/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix b/pkgs/applications/version-management/git-delete-merged-branches/default.nix
index 7d3d1b6b2c692..7d3d1b6b2c692 100644
--- a/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix
+++ b/pkgs/applications/version-management/git-delete-merged-branches/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-extras/default.nix
index 937a771b1e42e..937a771b1e42e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
+++ b/pkgs/applications/version-management/git-extras/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile b/pkgs/applications/version-management/git-fame/Gemfile
index 17373f02b44dd..17373f02b44dd 100644
--- a/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile
+++ b/pkgs/applications/version-management/git-fame/Gemfile
diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock b/pkgs/applications/version-management/git-fame/Gemfile.lock
index 12c58d72103ac..12c58d72103ac 100644
--- a/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock
+++ b/pkgs/applications/version-management/git-fame/Gemfile.lock
diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/pkgs/applications/version-management/git-fame/default.nix
index 4dc9c4f8453d6..4dc9c4f8453d6 100644
--- a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
+++ b/pkgs/applications/version-management/git-fame/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix b/pkgs/applications/version-management/git-fame/gemset.nix
index 07dd36ac68a04..07dd36ac68a04 100644
--- a/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix
+++ b/pkgs/applications/version-management/git-fame/gemset.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-fire/default.nix b/pkgs/applications/version-management/git-fire/default.nix
index bc7e9f4840b71..bc7e9f4840b71 100644
--- a/pkgs/applications/version-management/git-and-tools/git-fire/default.nix
+++ b/pkgs/applications/version-management/git-fire/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-ftp/default.nix b/pkgs/applications/version-management/git-ftp/default.nix
index 57b5e3c463724..57b5e3c463724 100644
--- a/pkgs/applications/version-management/git-and-tools/git-ftp/default.nix
+++ b/pkgs/applications/version-management/git-ftp/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-gone/default.nix
index fd93c337eac0e..fd93c337eac0e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
+++ b/pkgs/applications/version-management/git-gone/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-hound/default.nix b/pkgs/applications/version-management/git-hound/default.nix
index 463d550cbcabb..463d550cbcabb 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hound/default.nix
+++ b/pkgs/applications/version-management/git-hound/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-hub/default.nix
index 279ae81b10108..279ae81b10108 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-hub/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-ignore/default.nix
index b6595a7278ea2..b6595a7278ea2 100644
--- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
+++ b/pkgs/applications/version-management/git-ignore/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-imerge/default.nix
index e1caede77d8e1..e1caede77d8e1 100644
--- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
+++ b/pkgs/applications/version-management/git-imerge/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix
index 97e2cf0537ac9..97e2cf0537ac9 100644
--- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix
+++ b/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index bbb7d29422aa7..bbb7d29422aa7 100644
--- a/pkgs/applications/version-management/git-and-tools/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix
index a41380380bcc7..a41380380bcc7 100644
--- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-machete/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-my/default.nix b/pkgs/applications/version-management/git-my/default.nix
index d8ce7a42bb591..d8ce7a42bb591 100644
--- a/pkgs/applications/version-management/git-and-tools/git-my/default.nix
+++ b/pkgs/applications/version-management/git-my/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-nomad/default.nix b/pkgs/applications/version-management/git-nomad/default.nix
index 04ba2ca849a6e..04ba2ca849a6e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-nomad/default.nix
+++ b/pkgs/applications/version-management/git-nomad/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/pkgs/applications/version-management/git-octopus/default.nix
index 7b8b5fed90f44..7b8b5fed90f44 100644
--- a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
+++ b/pkgs/applications/version-management/git-octopus/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-open/default.nix
index 2c57ca1f84011..2c57ca1f84011 100644
--- a/pkgs/applications/version-management/git-and-tools/git-open/default.nix
+++ b/pkgs/applications/version-management/git-open/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-privacy/default.nix b/pkgs/applications/version-management/git-privacy/default.nix
index d162f9ce20ba5..d162f9ce20ba5 100644
--- a/pkgs/applications/version-management/git-and-tools/git-privacy/default.nix
+++ b/pkgs/applications/version-management/git-privacy/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-publish/default.nix b/pkgs/applications/version-management/git-publish/default.nix
index 0f0eeff156b06..0f0eeff156b06 100644
--- a/pkgs/applications/version-management/git-and-tools/git-publish/default.nix
+++ b/pkgs/applications/version-management/git-publish/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-quick-stats/default.nix b/pkgs/applications/version-management/git-quick-stats/default.nix
index 336c24819baf0..336c24819baf0 100644
--- a/pkgs/applications/version-management/git-and-tools/git-quick-stats/default.nix
+++ b/pkgs/applications/version-management/git-quick-stats/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix b/pkgs/applications/version-management/git-quickfix/default.nix
index 4b4319f8cd7cc..4b4319f8cd7cc 100644
--- a/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix
+++ b/pkgs/applications/version-management/git-quickfix/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-radar/default.nix
index 1cd14aa969278..1cd14aa969278 100644
--- a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
+++ b/pkgs/applications/version-management/git-radar/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-recent/default.nix
index 1a1811b2f4384..1a1811b2f4384 100644
--- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
+++ b/pkgs/applications/version-management/git-recent/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix b/pkgs/applications/version-management/git-remote-codecommit/default.nix
index 8ada5cc42f54e..8ada5cc42f54e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix
+++ b/pkgs/applications/version-management/git-remote-codecommit/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-remote-gcrypt/default.nix
index 8f3155ce0546b..8f3155ce0546b 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
+++ b/pkgs/applications/version-management/git-remote-gcrypt/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-remote-hg/default.nix
index b76f7515eba6c..b76f7515eba6c 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
+++ b/pkgs/applications/version-management/git-remote-hg/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix b/pkgs/applications/version-management/git-reparent/default.nix
index ec1c44b96134e..ec1c44b96134e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
+++ b/pkgs/applications/version-management/git-reparent/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-repo-updater/default.nix b/pkgs/applications/version-management/git-repo-updater/default.nix
index ebea57c1552a8..ebea57c1552a8 100644
--- a/pkgs/applications/version-management/git-and-tools/git-repo-updater/default.nix
+++ b/pkgs/applications/version-management/git-repo-updater/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index e47ea6b12dbef..e47ea6b12dbef 100644
--- a/pkgs/applications/version-management/git-and-tools/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-repo/import-ssl-module.patch b/pkgs/applications/version-management/git-repo/import-ssl-module.patch
index efc3d2b1f8a5e..efc3d2b1f8a5e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-repo/import-ssl-module.patch
+++ b/pkgs/applications/version-management/git-repo/import-ssl-module.patch
diff --git a/pkgs/applications/version-management/git-and-tools/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix
index 2650f330c0a99..2650f330c0a99 100644
--- a/pkgs/applications/version-management/git-and-tools/git-review/default.nix
+++ b/pkgs/applications/version-management/git-review/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-secret/default.nix
index 6293af4642a34..6293af4642a34 100644
--- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
+++ b/pkgs/applications/version-management/git-secret/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-secrets/default.nix
index 154a4048e0a7a..154a4048e0a7a 100644
--- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
+++ b/pkgs/applications/version-management/git-secrets/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-series/default.nix b/pkgs/applications/version-management/git-series/default.nix
index 31d1c635512c4..31d1c635512c4 100644
--- a/pkgs/applications/version-management/git-and-tools/git-series/default.nix
+++ b/pkgs/applications/version-management/git-series/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-sizer/default.nix b/pkgs/applications/version-management/git-sizer/default.nix
index ed7239b80cb33..ed7239b80cb33 100644
--- a/pkgs/applications/version-management/git-and-tools/git-sizer/default.nix
+++ b/pkgs/applications/version-management/git-sizer/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix b/pkgs/applications/version-management/git-standup/default.nix
index 2bbf7840138dd..2bbf7840138dd 100644
--- a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix
+++ b/pkgs/applications/version-management/git-standup/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix b/pkgs/applications/version-management/git-stree/default.nix
index aa53529933ff1..aa53529933ff1 100644
--- a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
+++ b/pkgs/applications/version-management/git-stree/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix b/pkgs/applications/version-management/git-subrepo/default.nix
index 23b8fd95cfd67..23b8fd95cfd67 100644
--- a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix
+++ b/pkgs/applications/version-management/git-subrepo/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-subset/default.nix b/pkgs/applications/version-management/git-subset/default.nix
index 53db1c01eefb7..53db1c01eefb7 100644
--- a/pkgs/applications/version-management/git-and-tools/git-subset/default.nix
+++ b/pkgs/applications/version-management/git-subset/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/pkgs/applications/version-management/git-subtrac/default.nix
index 4e9c3b7a5ccc0..4e9c3b7a5ccc0 100644
--- a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix
+++ b/pkgs/applications/version-management/git-subtrac/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-sync/default.nix
index 9180db63a8139..9180db63a8139 100644
--- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
+++ b/pkgs/applications/version-management/git-sync/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-team/default.nix b/pkgs/applications/version-management/git-team/default.nix
index afce41e15d19a..afce41e15d19a 100644
--- a/pkgs/applications/version-management/git-and-tools/git-team/default.nix
+++ b/pkgs/applications/version-management/git-team/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-test/default.nix b/pkgs/applications/version-management/git-test/default.nix
index 624ce5616909e..624ce5616909e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-test/default.nix
+++ b/pkgs/applications/version-management/git-test/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-town/default.nix b/pkgs/applications/version-management/git-town/default.nix
index abca61358d99b..abca61358d99b 100644
--- a/pkgs/applications/version-management/git-and-tools/git-town/default.nix
+++ b/pkgs/applications/version-management/git-town/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix b/pkgs/applications/version-management/git-trim/default.nix
index a20c750ade10d..a20c750ade10d 100644
--- a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix
+++ b/pkgs/applications/version-management/git-trim/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix
index 71ae40e25d35b..71ae40e25d35b 100644
--- a/pkgs/applications/version-management/git-and-tools/git-up/default.nix
+++ b/pkgs/applications/version-management/git-up/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix b/pkgs/applications/version-management/git-vanity-hash/default.nix
index a77bdd4933008..a77bdd4933008 100644
--- a/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix
+++ b/pkgs/applications/version-management/git-vanity-hash/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix b/pkgs/applications/version-management/git-vendor/default.nix
index a4e0290d31024..a4e0290d31024 100644
--- a/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix
+++ b/pkgs/applications/version-management/git-vendor/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-when-merged/default.nix b/pkgs/applications/version-management/git-when-merged/default.nix
index d020f351fedf5..d020f351fedf5 100644
--- a/pkgs/applications/version-management/git-and-tools/git-when-merged/default.nix
+++ b/pkgs/applications/version-management/git-when-merged/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-workspace/default.nix
index 6ccfafeb70ee9..6ccfafeb70ee9 100644
--- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
+++ b/pkgs/applications/version-management/git-workspace/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 2d63ae403791c..2d63ae403791c 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch b/pkgs/applications/version-management/git/docbook2texi.patch
index f8f8ab86a9ce5..f8f8ab86a9ce5 100644
--- a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch
+++ b/pkgs/applications/version-management/git/docbook2texi.patch
diff --git a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch b/pkgs/applications/version-management/git/git-send-email-honor-PATH.patch
index c78400847418e..c78400847418e 100644
--- a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
+++ b/pkgs/applications/version-management/git/git-send-email-honor-PATH.patch
diff --git a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch b/pkgs/applications/version-management/git/git-sh-i18n.patch
index 721f2aa099c44..721f2aa099c44 100644
--- a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
+++ b/pkgs/applications/version-management/git/git-sh-i18n.patch
diff --git a/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch b/pkgs/applications/version-management/git/installCheck-path.patch
index 4b73d11744baf..4b73d11744baf 100644
--- a/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch
+++ b/pkgs/applications/version-management/git/installCheck-path.patch
diff --git a/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch b/pkgs/applications/version-management/git/ssh-path.patch
index 71cdc694ac315..71cdc694ac315 100644
--- a/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
+++ b/pkgs/applications/version-management/git/ssh-path.patch
diff --git a/pkgs/applications/version-management/git-and-tools/git/update.sh b/pkgs/applications/version-management/git/update.sh
index 54574722b02b7..54574722b02b7 100755
--- a/pkgs/applications/version-management/git-and-tools/git/update.sh
+++ b/pkgs/applications/version-management/git/update.sh
diff --git a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/pkgs/applications/version-management/git2cl/default.nix
index b68179b182bca..b68179b182bca 100644
--- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
+++ b/pkgs/applications/version-management/git2cl/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gita/default.nix b/pkgs/applications/version-management/gita/default.nix
index 6f20e4a44c6fe..6f20e4a44c6fe 100644
--- a/pkgs/applications/version-management/git-and-tools/gita/default.nix
+++ b/pkgs/applications/version-management/gita/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix b/pkgs/applications/version-management/gitbatch/default.nix
index 0eb20db1462ab..0eb20db1462ab 100644
--- a/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix
+++ b/pkgs/applications/version-management/gitbatch/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/gitflow/default.nix
index ce612fcd52d31..ce612fcd52d31 100644
--- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
+++ b/pkgs/applications/version-management/gitflow/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix
index 31ab40d79478f..31ab40d79478f 100644
--- a/pkgs/applications/version-management/git-and-tools/gitless/default.nix
+++ b/pkgs/applications/version-management/gitless/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gitlint/default.nix b/pkgs/applications/version-management/gitlint/default.nix
index 626739864c713..626739864c713 100644
--- a/pkgs/applications/version-management/git-and-tools/gitlint/default.nix
+++ b/pkgs/applications/version-management/gitlint/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gitls/default.nix b/pkgs/applications/version-management/gitls/default.nix
index 4cda10b380575..4cda10b380575 100644
--- a/pkgs/applications/version-management/git-and-tools/gitls/default.nix
+++ b/pkgs/applications/version-management/gitls/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gitmux/default.nix b/pkgs/applications/version-management/gitmux/default.nix
index 7e66985bb8864..7e66985bb8864 100644
--- a/pkgs/applications/version-management/git-and-tools/gitmux/default.nix
+++ b/pkgs/applications/version-management/gitmux/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix b/pkgs/applications/version-management/gitnuro/default.nix
index db79637ef9ff9..db79637ef9ff9 100644
--- a/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix
+++ b/pkgs/applications/version-management/gitnuro/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix
index d2a51c94727a2..d2a51c94727a2 100644
--- a/pkgs/applications/version-management/git-and-tools/gitoxide/default.nix
+++ b/pkgs/applications/version-management/gitoxide/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gitsign/default.nix b/pkgs/applications/version-management/gitsign/default.nix
index 11a8394a63c49..11a8394a63c49 100644
--- a/pkgs/applications/version-management/git-and-tools/gitsign/default.nix
+++ b/pkgs/applications/version-management/gitsign/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gitstats/default.nix b/pkgs/applications/version-management/gitstats/default.nix
index 6cfcb0077427f..6cfcb0077427f 100644
--- a/pkgs/applications/version-management/git-and-tools/gitstats/default.nix
+++ b/pkgs/applications/version-management/gitstats/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/gitstatus/default.nix
index 4b669c27252e2..4b669c27252e2 100644
--- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
+++ b/pkgs/applications/version-management/gitstatus/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/gitstatus/romkatv_libgit2.nix
index 73d35b1bd9b2f..73d35b1bd9b2f 100644
--- a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
+++ b/pkgs/applications/version-management/gitstatus/romkatv_libgit2.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gitty/default.nix b/pkgs/applications/version-management/gitty/default.nix
index 12a82143c35b4..12a82143c35b4 100644
--- a/pkgs/applications/version-management/git-and-tools/gitty/default.nix
+++ b/pkgs/applications/version-management/gitty/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/gitui/default.nix
index a161fb2c6b1b6..a161fb2c6b1b6 100644
--- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix
+++ b/pkgs/applications/version-management/gitui/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/pkgs/applications/version-management/gitweb/default.nix
index 2c8d7eedc2d90..2c8d7eedc2d90 100644
--- a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
+++ b/pkgs/applications/version-management/gitweb/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/glab/default.nix
index 9d6bbbd13f67c..9d6bbbd13f67c 100644
--- a/pkgs/applications/version-management/git-and-tools/glab/default.nix
+++ b/pkgs/applications/version-management/glab/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/glitter/default.nix b/pkgs/applications/version-management/glitter/default.nix
index e51791042b999..e51791042b999 100644
--- a/pkgs/applications/version-management/git-and-tools/glitter/default.nix
+++ b/pkgs/applications/version-management/glitter/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/gst/default.nix b/pkgs/applications/version-management/gst/default.nix
index f0f347d14ca46..f0f347d14ca46 100644
--- a/pkgs/applications/version-management/git-and-tools/gst/default.nix
+++ b/pkgs/applications/version-management/gst/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/hub/default.nix
index cb75ec8264640..cb75ec8264640 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/hub/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/hut/default.nix b/pkgs/applications/version-management/hut/default.nix
index f2623d326d0ac..f2623d326d0ac 100644
--- a/pkgs/applications/version-management/git-and-tools/hut/default.nix
+++ b/pkgs/applications/version-management/hut/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/josh/default.nix b/pkgs/applications/version-management/josh/default.nix
index acf2b24c0794e..acf2b24c0794e 100644
--- a/pkgs/applications/version-management/git-and-tools/josh/default.nix
+++ b/pkgs/applications/version-management/josh/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/lab/default.nix
index 754fa778fed90..754fa778fed90 100644
--- a/pkgs/applications/version-management/git-and-tools/lab/default.nix
+++ b/pkgs/applications/version-management/lab/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/lefthook/default.nix
index ac4b7762c2e44..ac4b7762c2e44 100644
--- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
+++ b/pkgs/applications/version-management/lefthook/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/legit/default.nix b/pkgs/applications/version-management/legit/default.nix
index 33efad77f9089..33efad77f9089 100644
--- a/pkgs/applications/version-management/git-and-tools/legit/default.nix
+++ b/pkgs/applications/version-management/legit/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix b/pkgs/applications/version-management/lucky-commit/default.nix
index a484aa6c3290b..a484aa6c3290b 100644
--- a/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix
+++ b/pkgs/applications/version-management/lucky-commit/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/pkgs/applications/version-management/pass-git-helper/default.nix
index 63f7a459a70a5..63f7a459a70a5 100644
--- a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
+++ b/pkgs/applications/version-management/pass-git-helper/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/qgit/default.nix
index 85cb9127c21e2..85cb9127c21e2 100644
--- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix
+++ b/pkgs/applications/version-management/qgit/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/radicle-cli/default.nix b/pkgs/applications/version-management/radicle-cli/default.nix
index a8df056774a2a..a8df056774a2a 100644
--- a/pkgs/applications/version-management/git-and-tools/radicle-cli/default.nix
+++ b/pkgs/applications/version-management/radicle-cli/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/pkgs/applications/version-management/radicle-upstream/default.nix
index c88d0b9d38666..c88d0b9d38666 100644
--- a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix
+++ b/pkgs/applications/version-management/radicle-upstream/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/rs-git-fsmonitor/default.nix b/pkgs/applications/version-management/rs-git-fsmonitor/default.nix
index e885b7c060782..e885b7c060782 100644
--- a/pkgs/applications/version-management/git-and-tools/rs-git-fsmonitor/default.nix
+++ b/pkgs/applications/version-management/rs-git-fsmonitor/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix b/pkgs/applications/version-management/scmpuff/default.nix
index 65ca1b476d4d6..65ca1b476d4d6 100644
--- a/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix
+++ b/pkgs/applications/version-management/scmpuff/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/stgit/default.nix
index b5bdecd85ad16..b5bdecd85ad16 100644
--- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix
+++ b/pkgs/applications/version-management/stgit/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/subgit/default.nix
index 0ec06aeaaa685..0ec06aeaaa685 100644
--- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix
+++ b/pkgs/applications/version-management/subgit/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/svn-all-fast-export/default.nix
index a40e959a50a41..a40e959a50a41 100644
--- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
+++ b/pkgs/applications/version-management/svn-all-fast-export/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/svn2git/default.nix
index 562658a6e99fe..562658a6e99fe 100644
--- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+++ b/pkgs/applications/version-management/svn2git/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/pkgs/applications/version-management/thicket/default.nix
index 1f331ffd49623..1f331ffd49623 100644
--- a/pkgs/applications/version-management/git-and-tools/thicket/default.nix
+++ b/pkgs/applications/version-management/thicket/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/tig/default.nix
index cfce8a35f9e12..cfce8a35f9e12 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/tig/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/topgit/default.nix
index 86e0d1b3c8099..86e0d1b3c8099 100644
--- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix
+++ b/pkgs/applications/version-management/topgit/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/transcrypt/default.nix
index 3225744abc57c..3225744abc57c 100644
--- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
+++ b/pkgs/applications/version-management/transcrypt/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch b/pkgs/applications/version-management/transcrypt/helper-scripts_depspathprefix.patch
index 925aadab3dd59..925aadab3dd59 100644
--- a/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch
+++ b/pkgs/applications/version-management/transcrypt/helper-scripts_depspathprefix.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bff0e2f7591c6..f3c9cdee4394e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1536,9 +1536,9 @@ with pkgs;
 
   zq = callPackage ../development/tools/zq { };
 
-  ### APPLICATIONS/VERSION-MANAGEMENT/GIT-AND-TOOLS
+  ### APPLICATIONS/VERSION-MANAGEMENT
 
-  git = callPackage ../applications/version-management/git-and-tools/git {
+  git = callPackage ../applications/version-management/git {
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;
     perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey];
     smtpPerlLibs = [
@@ -1575,62 +1575,62 @@ with pkgs;
     withpcre2 = false;
   };
 
-  bfg-repo-cleaner = callPackage ../applications/version-management/git-and-tools/bfg-repo-cleaner { };
+  bfg-repo-cleaner = callPackage ../applications/version-management/bfg-repo-cleaner { };
 
-  bit = callPackage ../applications/version-management/git-and-tools/bit { };
+  bit = callPackage ../applications/version-management/bit { };
 
-  bitbucket-server-cli = callPackage ../applications/version-management/git-and-tools/bitbucket-server-cli { };
+  bitbucket-server-cli = callPackage ../applications/version-management/bitbucket-server-cli { };
 
-  bump2version = python3Packages.callPackage ../applications/version-management/git-and-tools/bump2version { };
+  bump2version = python3Packages.callPackage ../applications/version-management/bump2version { };
 
-  cgit = callPackage ../applications/version-management/git-and-tools/cgit { };
+  cgit = callPackage ../applications/version-management/cgit { };
 
-  cgit-pink = callPackage ../applications/version-management/git-and-tools/cgit/pink.nix { };
+  cgit-pink = callPackage ../applications/version-management/cgit/pink.nix { };
 
-  conform = callPackage ../applications/version-management/git-and-tools/conform { };
+  conform = callPackage ../applications/version-management/conform { };
 
-  darcs-to-git = callPackage ../applications/version-management/git-and-tools/darcs-to-git { };
+  darcs-to-git = callPackage ../applications/version-management/darcs-to-git { };
 
-  delta = callPackage ../applications/version-management/git-and-tools/delta {
+  delta = callPackage ../applications/version-management/delta {
     inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation Security;
   };
 
-  diff-so-fancy = callPackage ../applications/version-management/git-and-tools/diff-so-fancy { };
+  diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { };
 
-  gex = callPackage ../applications/version-management/git-and-tools/gex { };
+  gex = callPackage ../applications/version-management/gex { };
 
-  gfold = callPackage ../applications/version-management/git-and-tools/gfold {
+  gfold = callPackage ../applications/version-management/gfold {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  gita = python3Packages.callPackage ../applications/version-management/git-and-tools/gita { };
+  gita = python3Packages.callPackage ../applications/version-management/gita { };
 
-  gitoxide = callPackage ../applications/version-management/git-and-tools/gitoxide {
+  gitoxide = callPackage ../applications/version-management/gitoxide {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  gg-scm = callPackage ../applications/version-management/git-and-tools/gg { };
+  gg-scm = callPackage ../applications/version-management/gg { };
 
   github-cli = gh;
-  gh = callPackage ../applications/version-management/git-and-tools/gh { };
+  gh = callPackage ../applications/version-management/gh { };
 
-  ghorg = callPackage ../applications/version-management/git-and-tools/ghorg { };
+  ghorg = callPackage ../applications/version-management/ghorg { };
 
-  ghq = callPackage ../applications/version-management/git-and-tools/ghq { };
+  ghq = callPackage ../applications/version-management/ghq { };
 
-  ghr = callPackage ../applications/version-management/git-and-tools/ghr { };
+  ghr = callPackage ../applications/version-management/ghr { };
 
-  git-absorb = callPackage ../applications/version-management/git-and-tools/git-absorb {
+  git-absorb = callPackage ../applications/version-management/git-absorb {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  git-aggregator = callPackage ../applications/version-management/git-and-tools/git-aggregator { };
+  git-aggregator = callPackage ../applications/version-management/git-aggregator { };
 
-  git-annex-metadata-gui = libsForQt5.callPackage ../applications/version-management/git-and-tools/git-annex-metadata-gui {
+  git-annex-metadata-gui = libsForQt5.callPackage ../applications/version-management/git-annex-metadata-gui {
     inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter;
   };
 
-  git-annex-remote-dbx = callPackage ../applications/version-management/git-and-tools/git-annex-remote-dbx {
+  git-annex-remote-dbx = callPackage ../applications/version-management/git-annex-remote-dbx {
     inherit (python3Packages)
     buildPythonApplication
     fetchPypi
@@ -1639,7 +1639,7 @@ with pkgs;
     humanfriendly;
   };
 
-  git-annex-remote-googledrive = callPackage ../applications/version-management/git-and-tools/git-annex-remote-googledrive {
+  git-annex-remote-googledrive = callPackage ../applications/version-management/git-annex-remote-googledrive {
     inherit (python3Packages)
     buildPythonApplication
     fetchPypi
@@ -1650,262 +1650,262 @@ with pkgs;
     humanfriendly;
   };
 
-  git-annex-remote-rclone = callPackage ../applications/version-management/git-and-tools/git-annex-remote-rclone { };
+  git-annex-remote-rclone = callPackage ../applications/version-management/git-annex-remote-rclone { };
 
-  git-annex-utils = callPackage ../applications/version-management/git-and-tools/git-annex-utils { };
+  git-annex-utils = callPackage ../applications/version-management/git-annex-utils { };
 
-  git-appraise = callPackage ../applications/version-management/git-and-tools/git-appraise { };
+  git-appraise = callPackage ../applications/version-management/git-appraise { };
 
-  git-backup = callPackage ../applications/version-management/git-and-tools/git-backup {
+  git-backup = callPackage ../applications/version-management/git-backup {
     openssl = openssl_1_1;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  git-big-picture = callPackage ../applications/version-management/git-and-tools/git-big-picture { };
+  git-big-picture = callPackage ../applications/version-management/git-big-picture { };
 
-  git-branchless = callPackage ../applications/version-management/git-and-tools/git-branchless {
+  git-branchless = callPackage ../applications/version-management/git-branchless {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  git-bug = callPackage ../applications/version-management/git-and-tools/git-bug { };
+  git-bug = callPackage ../applications/version-management/git-bug { };
 
-  git-chglog = callPackage ../applications/version-management/git-and-tools/git-chglog { };
+  git-chglog = callPackage ../applications/version-management/git-chglog { };
 
-  git-cinnabar = callPackage ../applications/version-management/git-and-tools/git-cinnabar {
+  git-cinnabar = callPackage ../applications/version-management/git-cinnabar {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  git-cliff = callPackage ../applications/version-management/git-and-tools/git-cliff {
+  git-cliff = callPackage ../applications/version-management/git-cliff {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  git-codeowners = callPackage ../applications/version-management/git-and-tools/git-codeowners { };
+  git-codeowners = callPackage ../applications/version-management/git-codeowners { };
 
-  git-codereview = callPackage ../applications/version-management/git-and-tools/git-codereview { };
+  git-codereview = callPackage ../applications/version-management/git-codereview { };
 
-  git-cola = callPackage ../applications/version-management/git-and-tools/git-cola { };
+  git-cola = callPackage ../applications/version-management/git-cola { };
 
-  git-crecord = callPackage ../applications/version-management/git-and-tools/git-crecord { };
+  git-crecord = callPackage ../applications/version-management/git-crecord { };
 
-  git-credential-1password = callPackage ../applications/version-management/git-and-tools/git-credential-1password { };
+  git-credential-1password = callPackage ../applications/version-management/git-credential-1password { };
 
-  git-credential-keepassxc = callPackage ../applications/version-management/git-and-tools/git-credential-keepassxc {
+  git-credential-keepassxc = callPackage ../applications/version-management/git-credential-keepassxc {
     inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation;
   };
 
-  git-crypt = callPackage ../applications/version-management/git-and-tools/git-crypt { };
+  git-crypt = callPackage ../applications/version-management/git-crypt { };
 
-  git-delete-merged-branches = callPackage ../applications/version-management/git-and-tools/git-delete-merged-branches { };
+  git-delete-merged-branches = callPackage ../applications/version-management/git-delete-merged-branches { };
 
-  git-extras = callPackage ../applications/version-management/git-and-tools/git-extras { };
+  git-extras = callPackage ../applications/version-management/git-extras { };
 
-  git-fame = callPackage ../applications/version-management/git-and-tools/git-fame { };
+  git-fame = callPackage ../applications/version-management/git-fame { };
 
-  git-fast-export = callPackage ../applications/version-management/git-and-tools/fast-export { };
+  git-fast-export = callPackage ../applications/version-management/fast-export { };
 
-  git-fire = callPackage ../applications/version-management/git-and-tools/git-fire { };
+  git-fire = callPackage ../applications/version-management/git-fire { };
 
-  git-ftp = callPackage ../applications/version-management/git-and-tools/git-ftp { };
+  git-ftp = callPackage ../applications/version-management/git-ftp { };
 
-  git-gone = callPackage ../applications/version-management/git-and-tools/git-gone {
+  git-gone = callPackage ../applications/version-management/git-gone {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  git-hound = callPackage ../applications/version-management/git-and-tools/git-hound { };
+  git-hound = callPackage ../applications/version-management/git-hound { };
 
-  git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { };
+  git-hub = callPackage ../applications/version-management/git-hub { };
 
-  git-ignore = callPackage ../applications/version-management/git-and-tools/git-ignore { };
+  git-ignore = callPackage ../applications/version-management/git-ignore { };
 
-  git-imerge = python3Packages.callPackage ../applications/version-management/git-and-tools/git-imerge { };
+  git-imerge = python3Packages.callPackage ../applications/version-management/git-imerge { };
 
-  git-interactive-rebase-tool = callPackage ../applications/version-management/git-and-tools/git-interactive-rebase-tool {
+  git-interactive-rebase-tool = callPackage ../applications/version-management/git-interactive-rebase-tool {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  git-lfs = lowPrio (callPackage ../applications/version-management/git-and-tools/git-lfs { });
+  git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { });
 
-  git-my = callPackage ../applications/version-management/git-and-tools/git-my { };
+  git-my = callPackage ../applications/version-management/git-my { };
 
-  git-machete = python3Packages.callPackage ../applications/version-management/git-and-tools/git-machete { };
+  git-machete = python3Packages.callPackage ../applications/version-management/git-machete { };
 
-  git-nomad = callPackage ../applications/version-management/git-and-tools/git-nomad {
+  git-nomad = callPackage ../applications/version-management/git-nomad {
     inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
   };
 
-  git-octopus = callPackage ../applications/version-management/git-and-tools/git-octopus { };
+  git-octopus = callPackage ../applications/version-management/git-octopus { };
 
-  git-open = callPackage ../applications/version-management/git-and-tools/git-open { };
+  git-open = callPackage ../applications/version-management/git-open { };
 
-  git-privacy = callPackage ../applications/version-management/git-and-tools/git-privacy { };
+  git-privacy = callPackage ../applications/version-management/git-privacy { };
 
-  git-publish = python3Packages.callPackage ../applications/version-management/git-and-tools/git-publish { };
+  git-publish = python3Packages.callPackage ../applications/version-management/git-publish { };
 
-  git-quick-stats = callPackage ../applications/version-management/git-and-tools/git-quick-stats { };
+  git-quick-stats = callPackage ../applications/version-management/git-quick-stats { };
 
-  git-quickfix = callPackage ../applications/version-management/git-and-tools/git-quickfix {
+  git-quickfix = callPackage ../applications/version-management/git-quickfix {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  git-radar = callPackage ../applications/version-management/git-and-tools/git-radar { };
+  git-radar = callPackage ../applications/version-management/git-radar { };
 
-  git-recent = callPackage ../applications/version-management/git-and-tools/git-recent {
+  git-recent = callPackage ../applications/version-management/git-recent {
     util-linux = if stdenv.isLinux then util-linuxMinimal else util-linux;
   };
 
-  git-remote-codecommit = python3Packages.callPackage ../applications/version-management/git-and-tools/git-remote-codecommit { };
+  git-remote-codecommit = python3Packages.callPackage ../applications/version-management/git-remote-codecommit { };
 
   gitRepo = git-repo;
-  git-repo = callPackage ../applications/version-management/git-and-tools/git-repo { };
+  git-repo = callPackage ../applications/version-management/git-repo { };
 
-  git-repo-updater = python3Packages.callPackage ../applications/version-management/git-and-tools/git-repo-updater { };
+  git-repo-updater = python3Packages.callPackage ../applications/version-management/git-repo-updater { };
 
-  git-review = python3Packages.callPackage ../applications/version-management/git-and-tools/git-review { };
+  git-review = python3Packages.callPackage ../applications/version-management/git-review { };
 
-  git-remote-gcrypt = callPackage ../applications/version-management/git-and-tools/git-remote-gcrypt { };
+  git-remote-gcrypt = callPackage ../applications/version-management/git-remote-gcrypt { };
 
-  git-remote-hg = callPackage ../applications/version-management/git-and-tools/git-remote-hg { };
+  git-remote-hg = callPackage ../applications/version-management/git-remote-hg { };
 
-  git-reparent = callPackage ../applications/version-management/git-and-tools/git-reparent { };
+  git-reparent = callPackage ../applications/version-management/git-reparent { };
 
-  git-secret = callPackage ../applications/version-management/git-and-tools/git-secret { };
+  git-secret = callPackage ../applications/version-management/git-secret { };
 
-  git-secrets = callPackage ../applications/version-management/git-and-tools/git-secrets { };
+  git-secrets = callPackage ../applications/version-management/git-secrets { };
 
-  git-series = callPackage ../applications/version-management/git-and-tools/git-series {
+  git-series = callPackage ../applications/version-management/git-series {
     openssl = openssl_1_1;
   };
 
-  git-sizer = callPackage ../applications/version-management/git-and-tools/git-sizer { };
+  git-sizer = callPackage ../applications/version-management/git-sizer { };
 
-  git-standup = callPackage ../applications/version-management/git-and-tools/git-standup { };
+  git-standup = callPackage ../applications/version-management/git-standup { };
 
-  git-stree = callPackage ../applications/version-management/git-and-tools/git-stree { };
+  git-stree = callPackage ../applications/version-management/git-stree { };
 
-  git-subrepo = callPackage ../applications/version-management/git-and-tools/git-subrepo { };
+  git-subrepo = callPackage ../applications/version-management/git-subrepo { };
 
-  git-subset = callPackage ../applications/version-management/git-and-tools/git-subset {
+  git-subset = callPackage ../applications/version-management/git-subset {
     openssl = openssl_1_1;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  git-subtrac = callPackage ../applications/version-management/git-and-tools/git-subtrac { };
+  git-subtrac = callPackage ../applications/version-management/git-subtrac { };
 
-  git-sync = callPackage ../applications/version-management/git-and-tools/git-sync { };
+  git-sync = callPackage ../applications/version-management/git-sync { };
 
-  git-team = callPackage ../applications/version-management/git-and-tools/git-team { };
+  git-team = callPackage ../applications/version-management/git-team { };
 
-  git-test = callPackage ../applications/version-management/git-and-tools/git-test { };
+  git-test = callPackage ../applications/version-management/git-test { };
 
-  git-town = callPackage ../applications/version-management/git-and-tools/git-town { };
+  git-town = callPackage ../applications/version-management/git-town { };
 
-  git-trim = callPackage ../applications/version-management/git-and-tools/git-trim {
+  git-trim = callPackage ../applications/version-management/git-trim {
     openssl = openssl_1_1;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  git-up = callPackage ../applications/version-management/git-and-tools/git-up {
+  git-up = callPackage ../applications/version-management/git-up {
     pythonPackages = python3Packages;
   };
 
-  git-vanity-hash = callPackage ../applications/version-management/git-and-tools/git-vanity-hash { };
+  git-vanity-hash = callPackage ../applications/version-management/git-vanity-hash { };
 
-  git-vendor = callPackage ../applications/version-management/git-and-tools/git-vendor { };
+  git-vendor = callPackage ../applications/version-management/git-vendor { };
 
-  git-when-merged = callPackage ../applications/version-management/git-and-tools/git-when-merged { };
+  git-when-merged = callPackage ../applications/version-management/git-when-merged { };
 
-  git-workspace = callPackage ../applications/version-management/git-and-tools/git-workspace {
+  git-workspace = callPackage ../applications/version-management/git-workspace {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  git2cl = callPackage ../applications/version-management/git-and-tools/git2cl { };
+  git2cl = callPackage ../applications/version-management/git2cl { };
 
-  gitbatch = callPackage ../applications/version-management/git-and-tools/gitbatch { };
+  gitbatch = callPackage ../applications/version-management/gitbatch { };
 
-  gitflow = callPackage ../applications/version-management/git-and-tools/gitflow { };
+  gitflow = callPackage ../applications/version-management/gitflow { };
 
   gitfs = callPackage ../tools/filesystems/gitfs { };
 
-  gitless = callPackage ../applications/version-management/git-and-tools/gitless { };
+  gitless = callPackage ../applications/version-management/gitless { };
 
-  gitlint = python3Packages.callPackage ../applications/version-management/git-and-tools/gitlint { };
+  gitlint = python3Packages.callPackage ../applications/version-management/gitlint { };
 
-  gitls = callPackage ../applications/version-management/git-and-tools/gitls { };
+  gitls = callPackage ../applications/version-management/gitls { };
 
-  gitmux = callPackage ../applications/version-management/git-and-tools/gitmux { };
+  gitmux = callPackage ../applications/version-management/gitmux { };
 
-  gitnuro = callPackage ../applications/version-management/git-and-tools/gitnuro { };
+  gitnuro = callPackage ../applications/version-management/gitnuro { };
 
-  gitsign = callPackage ../applications/version-management/git-and-tools/gitsign { };
+  gitsign = callPackage ../applications/version-management/gitsign { };
 
-  gitstats = callPackage ../applications/version-management/git-and-tools/gitstats { };
+  gitstats = callPackage ../applications/version-management/gitstats { };
 
-  gitstatus = callPackage ../applications/version-management/git-and-tools/gitstatus { };
+  gitstatus = callPackage ../applications/version-management/gitstatus { };
 
-  gitty = callPackage ../applications/version-management/git-and-tools/gitty { };
+  gitty = callPackage ../applications/version-management/gitty { };
 
-  gitui = callPackage ../applications/version-management/git-and-tools/gitui {
+  gitui = callPackage ../applications/version-management/gitui {
     inherit (darwin.apple_sdk.frameworks) Security AppKit;
   };
 
-  gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { };
+  gitweb = callPackage ../applications/version-management/gitweb { };
 
-  glab = callPackage ../applications/version-management/git-and-tools/glab { };
+  glab = callPackage ../applications/version-management/glab { };
 
-  glitter = callPackage ../applications/version-management/git-and-tools/glitter { };
+  glitter = callPackage ../applications/version-management/glitter { };
 
-  gst = callPackage ../applications/version-management/git-and-tools/gst { };
+  gst = callPackage ../applications/version-management/gst { };
 
-  hub = callPackage ../applications/version-management/git-and-tools/hub { };
+  hub = callPackage ../applications/version-management/hub { };
 
-  hut = callPackage ../applications/version-management/git-and-tools/hut { };
+  hut = callPackage ../applications/version-management/hut { };
 
-  josh = callPackage ../applications/version-management/git-and-tools/josh { };
+  josh = callPackage ../applications/version-management/josh { };
 
-  lab = callPackage ../applications/version-management/git-and-tools/lab { };
+  lab = callPackage ../applications/version-management/lab { };
 
-  lefthook = callPackage ../applications/version-management/git-and-tools/lefthook { };
+  lefthook = callPackage ../applications/version-management/lefthook { };
 
-  legit = callPackage ../applications/version-management/git-and-tools/legit { };
+  legit = callPackage ../applications/version-management/legit { };
 
-  lucky-commit = callPackage ../applications/version-management/git-and-tools/lucky-commit {
+  lucky-commit = callPackage ../applications/version-management/lucky-commit {
     inherit (darwin.apple_sdk.frameworks) OpenCL;
   };
 
-  pass-git-helper = python3Packages.callPackage ../applications/version-management/git-and-tools/pass-git-helper { };
+  pass-git-helper = python3Packages.callPackage ../applications/version-management/pass-git-helper { };
 
-  qgit = qt5.callPackage ../applications/version-management/git-and-tools/qgit { };
+  qgit = qt5.callPackage ../applications/version-management/qgit { };
 
-  radicle-cli = callPackage ../applications/version-management/git-and-tools/radicle-cli {
+  radicle-cli = callPackage ../applications/version-management/radicle-cli {
     inherit (darwin) DarwinTools;
     inherit (darwin.apple_sdk.frameworks) AppKit;
   };
 
-  radicle-upstream = callPackage ../applications/version-management/git-and-tools/radicle-upstream { };
+  radicle-upstream = callPackage ../applications/version-management/radicle-upstream { };
 
-  rs-git-fsmonitor = callPackage ../applications/version-management/git-and-tools/rs-git-fsmonitor { };
+  rs-git-fsmonitor = callPackage ../applications/version-management/rs-git-fsmonitor { };
 
-  scmpuff = callPackage ../applications/version-management/git-and-tools/scmpuff { };
+  scmpuff = callPackage ../applications/version-management/scmpuff { };
 
-  stgit = callPackage ../applications/version-management/git-and-tools/stgit { };
+  stgit = callPackage ../applications/version-management/stgit { };
 
-  subgit = callPackage ../applications/version-management/git-and-tools/subgit { };
+  subgit = callPackage ../applications/version-management/subgit { };
 
-  svn-all-fast-export = libsForQt5.callPackage ../applications/version-management/git-and-tools/svn-all-fast-export { };
+  svn-all-fast-export = libsForQt5.callPackage ../applications/version-management/svn-all-fast-export { };
 
-  svn2git = callPackage ../applications/version-management/git-and-tools/svn2git {
+  svn2git = callPackage ../applications/version-management/svn2git {
     git = gitSVN;
   };
 
-  thicket = callPackage ../applications/version-management/git-and-tools/thicket { };
+  thicket = callPackage ../applications/version-management/thicket { };
 
-  tig = callPackage ../applications/version-management/git-and-tools/tig {
+  tig = callPackage ../applications/version-management/tig {
     readline = readline81;
   };
 
-  top-git = callPackage ../applications/version-management/git-and-tools/topgit { };
+  top-git = callPackage ../applications/version-management/topgit { };
 
-  transcrypt = callPackage ../applications/version-management/git-and-tools/transcrypt { };
+  transcrypt = callPackage ../applications/version-management/transcrypt { };
 
   inherit (haskellPackages) git-annex;