From d994dabacef6a7e13a41d144cd6d800f8e21a11f Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 19 Dec 2022 08:46:57 -0300 Subject: [PATCH] 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. --- .../bfg-repo-cleaner/default.nix | 0 .../{git-and-tools => }/bit/default.nix | 0 .../bitbucket-server-cli/Gemfile | 0 .../bitbucket-server-cli/Gemfile.lock | 0 .../bitbucket-server-cli/default.nix | 0 .../bitbucket-server-cli/gemset.nix | 0 .../bump2version/default.nix | 0 .../{git-and-tools => }/cgit/common.nix | 0 .../{git-and-tools => }/cgit/default.nix | 0 .../{git-and-tools => }/cgit/pink.nix | 0 .../{git-and-tools => }/conform/default.nix | 0 .../darcs-to-git/default.nix | 0 .../{git-and-tools => }/delta/default.nix | 0 .../diff-so-fancy/default.nix | 0 .../fast-export/default.nix | 0 .../{git-and-tools => }/gex/default.nix | 0 .../{git-and-tools => }/gfold/default.nix | 0 .../{git-and-tools => }/gg/default.nix | 0 .../{git-and-tools => }/gh/default.nix | 0 .../{git-and-tools => }/ghorg/default.nix | 0 .../{git-and-tools => }/ghq/default.nix | 0 .../{git-and-tools => }/ghr/default.nix | 0 .../git-absorb/default.nix | 0 .../git-aggregator/default.nix | 0 .../git-annex-metadata-gui/default.nix | 0 .../git-annex-remote-dbx/default.nix | 0 .../git-annex-remote-googledrive/default.nix | 0 .../git-annex-remote-rclone/default.nix | 0 .../git-annex-utils/default.nix | 0 .../git-appraise/default.nix | 0 .../git-backup/default.nix | 0 .../git-big-picture/default.nix | 0 .../git-branchless/default.nix | 0 .../{git-and-tools => }/git-bug/default.nix | 0 .../git-chglog/default.nix | 0 .../git-cinnabar/default.nix | 0 .../{git-and-tools => }/git-cliff/default.nix | 0 .../git-codeowners/default.nix | 0 .../git-codereview/default.nix | 0 .../{git-and-tools => }/git-cola/default.nix | 0 .../git-crecord/default.nix | 0 .../git-credential-1password/default.nix | 0 .../git-credential-keepassxc/default.nix | 0 .../{git-and-tools => }/git-crypt/default.nix | 0 .../git-delete-merged-branches/default.nix | 0 .../git-extras/default.nix | 0 .../{git-and-tools => }/git-fame/Gemfile | 0 .../{git-and-tools => }/git-fame/Gemfile.lock | 0 .../{git-and-tools => }/git-fame/default.nix | 0 .../{git-and-tools => }/git-fame/gemset.nix | 0 .../{git-and-tools => }/git-fire/default.nix | 0 .../{git-and-tools => }/git-ftp/default.nix | 0 .../{git-and-tools => }/git-gone/default.nix | 0 .../{git-and-tools => }/git-hound/default.nix | 0 .../{git-and-tools => }/git-hub/default.nix | 0 .../git-ignore/default.nix | 0 .../git-imerge/default.nix | 0 .../git-interactive-rebase-tool/default.nix | 0 .../{git-and-tools => }/git-lfs/default.nix | 0 .../git-machete/default.nix | 0 .../{git-and-tools => }/git-my/default.nix | 0 .../{git-and-tools => }/git-nomad/default.nix | 0 .../git-octopus/default.nix | 0 .../{git-and-tools => }/git-open/default.nix | 0 .../git-privacy/default.nix | 0 .../git-publish/default.nix | 0 .../git-quick-stats/default.nix | 0 .../git-quickfix/default.nix | 0 .../{git-and-tools => }/git-radar/default.nix | 0 .../git-recent/default.nix | 0 .../git-remote-codecommit/default.nix | 0 .../git-remote-gcrypt/default.nix | 0 .../git-remote-hg/default.nix | 0 .../git-reparent/default.nix | 0 .../git-repo-updater/default.nix | 0 .../{git-and-tools => }/git-repo/default.nix | 0 .../git-repo/import-ssl-module.patch | 0 .../git-review/default.nix | 0 .../git-secret/default.nix | 0 .../git-secrets/default.nix | 0 .../git-series/default.nix | 0 .../{git-and-tools => }/git-sizer/default.nix | 0 .../git-standup/default.nix | 0 .../{git-and-tools => }/git-stree/default.nix | 0 .../git-subrepo/default.nix | 0 .../git-subset/default.nix | 0 .../git-subtrac/default.nix | 0 .../{git-and-tools => }/git-sync/default.nix | 0 .../{git-and-tools => }/git-team/default.nix | 0 .../{git-and-tools => }/git-test/default.nix | 0 .../{git-and-tools => }/git-town/default.nix | 0 .../{git-and-tools => }/git-trim/default.nix | 0 .../{git-and-tools => }/git-up/default.nix | 0 .../git-vanity-hash/default.nix | 0 .../git-vendor/default.nix | 0 .../git-when-merged/default.nix | 0 .../git-workspace/default.nix | 0 .../{git-and-tools => }/git/default.nix | 0 .../git/docbook2texi.patch | 0 .../git/git-send-email-honor-PATH.patch | 0 .../{git-and-tools => }/git/git-sh-i18n.patch | 0 .../git/installCheck-path.patch | 0 .../{git-and-tools => }/git/ssh-path.patch | 0 .../{git-and-tools => }/git/update.sh | 0 .../{git-and-tools => }/git2cl/default.nix | 0 .../{git-and-tools => }/gita/default.nix | 0 .../{git-and-tools => }/gitbatch/default.nix | 0 .../{git-and-tools => }/gitflow/default.nix | 0 .../{git-and-tools => }/gitless/default.nix | 0 .../{git-and-tools => }/gitlint/default.nix | 0 .../{git-and-tools => }/gitls/default.nix | 0 .../{git-and-tools => }/gitmux/default.nix | 0 .../{git-and-tools => }/gitnuro/default.nix | 0 .../{git-and-tools => }/gitoxide/default.nix | 0 .../{git-and-tools => }/gitsign/default.nix | 0 .../{git-and-tools => }/gitstats/default.nix | 0 .../{git-and-tools => }/gitstatus/default.nix | 0 .../gitstatus/romkatv_libgit2.nix | 0 .../{git-and-tools => }/gitty/default.nix | 0 .../{git-and-tools => }/gitui/default.nix | 0 .../{git-and-tools => }/gitweb/default.nix | 0 .../{git-and-tools => }/glab/default.nix | 0 .../{git-and-tools => }/glitter/default.nix | 0 .../{git-and-tools => }/gst/default.nix | 0 .../{git-and-tools => }/hub/default.nix | 0 .../{git-and-tools => }/hut/default.nix | 0 .../{git-and-tools => }/josh/default.nix | 0 .../{git-and-tools => }/lab/default.nix | 0 .../{git-and-tools => }/lefthook/default.nix | 0 .../{git-and-tools => }/legit/default.nix | 0 .../lucky-commit/default.nix | 0 .../pass-git-helper/default.nix | 0 .../{git-and-tools => }/qgit/default.nix | 0 .../radicle-cli/default.nix | 0 .../radicle-upstream/default.nix | 0 .../rs-git-fsmonitor/default.nix | 0 .../{git-and-tools => }/scmpuff/default.nix | 0 .../{git-and-tools => }/stgit/default.nix | 0 .../{git-and-tools => }/subgit/default.nix | 0 .../svn-all-fast-export/default.nix | 0 .../{git-and-tools => }/svn2git/default.nix | 0 .../{git-and-tools => }/thicket/default.nix | 0 .../{git-and-tools => }/tig/default.nix | 0 .../{git-and-tools => }/topgit/default.nix | 0 .../transcrypt/default.nix | 0 .../helper-scripts_depspathprefix.patch | 0 pkgs/top-level/all-packages.nix | 262 +++++++++--------- 147 files changed, 131 insertions(+), 131 deletions(-) rename pkgs/applications/version-management/{git-and-tools => }/bfg-repo-cleaner/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/bit/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/bitbucket-server-cli/Gemfile (100%) rename pkgs/applications/version-management/{git-and-tools => }/bitbucket-server-cli/Gemfile.lock (100%) rename pkgs/applications/version-management/{git-and-tools => }/bitbucket-server-cli/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/bitbucket-server-cli/gemset.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/bump2version/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/cgit/common.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/cgit/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/cgit/pink.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/conform/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/darcs-to-git/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/delta/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/diff-so-fancy/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/fast-export/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gex/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gfold/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gg/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gh/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/ghorg/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/ghq/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/ghr/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-absorb/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-aggregator/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-annex-metadata-gui/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-annex-remote-dbx/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-annex-remote-googledrive/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-annex-remote-rclone/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-annex-utils/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-appraise/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-backup/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-big-picture/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-branchless/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-bug/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-chglog/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-cinnabar/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-cliff/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-codeowners/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-codereview/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-cola/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-crecord/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-credential-1password/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-credential-keepassxc/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-crypt/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-delete-merged-branches/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-extras/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-fame/Gemfile (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-fame/Gemfile.lock (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-fame/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-fame/gemset.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-fire/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-ftp/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-gone/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-hound/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-hub/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-ignore/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-imerge/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-interactive-rebase-tool/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-lfs/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-machete/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-my/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-nomad/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-octopus/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-open/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-privacy/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-publish/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-quick-stats/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-quickfix/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-radar/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-recent/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-remote-codecommit/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-remote-gcrypt/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-remote-hg/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-reparent/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-repo-updater/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-repo/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-repo/import-ssl-module.patch (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-review/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-secret/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-secrets/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-series/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-sizer/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-standup/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-stree/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-subrepo/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-subset/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-subtrac/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-sync/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-team/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-test/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-town/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-trim/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-up/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-vanity-hash/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-vendor/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-when-merged/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git-workspace/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/git/docbook2texi.patch (100%) rename pkgs/applications/version-management/{git-and-tools => }/git/git-send-email-honor-PATH.patch (100%) rename pkgs/applications/version-management/{git-and-tools => }/git/git-sh-i18n.patch (100%) rename pkgs/applications/version-management/{git-and-tools => }/git/installCheck-path.patch (100%) rename pkgs/applications/version-management/{git-and-tools => }/git/ssh-path.patch (100%) rename pkgs/applications/version-management/{git-and-tools => }/git/update.sh (100%) rename pkgs/applications/version-management/{git-and-tools => }/git2cl/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gita/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gitbatch/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gitflow/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gitless/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gitlint/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gitls/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gitmux/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gitnuro/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gitoxide/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gitsign/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gitstats/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gitstatus/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gitstatus/romkatv_libgit2.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gitty/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gitui/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gitweb/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/glab/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/glitter/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/gst/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/hub/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/hut/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/josh/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/lab/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/lefthook/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/legit/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/lucky-commit/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/pass-git-helper/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/qgit/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/radicle-cli/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/radicle-upstream/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/rs-git-fsmonitor/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/scmpuff/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/stgit/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/subgit/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/svn-all-fast-export/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/svn2git/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/thicket/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/tig/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/topgit/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/transcrypt/default.nix (100%) rename pkgs/applications/version-management/{git-and-tools => }/transcrypt/helper-scripts_depspathprefix.patch (100%) 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/bit/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/bump2version/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/cgit/common.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/cgit/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/cgit/pink.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/conform/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/delta/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/fast-export/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gex/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gfold/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gg/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gh/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/ghorg/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/ghq/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/ghr/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-absorb/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-aggregator/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-appraise/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-backup/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-branchless/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-bug/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-chglog/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-cliff/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-codereview/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-cola/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-crecord/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-credential-1password/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-credential-keepassxc/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-crypt/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-extras/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-fame/Gemfile rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-fame/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-fire/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-ftp/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-gone/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-hound/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-hub/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-ignore/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-imerge/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-lfs/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-machete/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-my/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-nomad/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-octopus/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-open/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-privacy/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-publish/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-quick-stats/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-radar/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-recent/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-reparent/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-repo-updater/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-repo/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-repo/import-ssl-module.patch rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-review/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-secret/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-secrets/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-series/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-sizer/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-standup/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-stree/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-subset/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-sync/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-team/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-test/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-town/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-trim/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-up/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-vendor/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-when-merged/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-workspace/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git/ssh-path.patch rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git/update.sh rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git2cl/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gita/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gitbatch/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gitflow/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gitless/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gitlint/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gitls/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gitmux/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gitnuro/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gitoxide/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gitsign/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gitstats/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gitstatus/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gitty/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gitui/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gitweb/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/glab/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/glitter/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gst/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/hub/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/hut/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/josh/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/lab/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/lefthook/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/legit/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/qgit/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/radicle-cli/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/rs-git-fsmonitor/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/scmpuff/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/stgit/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/subgit/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/svn2git/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/thicket/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/tig/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/topgit/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/transcrypt/default.nix rename to 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 similarity index 100% rename from pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch rename to 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 bff0e2f7591c..f3c9cdee4394 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;