From a7764c1146a6624409e0bd3e175ef27e2a42157b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 06:56:11 -0300 Subject: [PATCH 01/23] git-aggregator: move to git-and-tools --- .../git-and-tools}/git-aggregator/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/tools => applications/version-management/git-and-tools}/git-aggregator/default.nix (100%) diff --git a/pkgs/development/tools/git-aggregator/default.nix b/pkgs/applications/version-management/git-and-tools/git-aggregator/default.nix similarity index 100% rename from pkgs/development/tools/git-aggregator/default.nix rename to pkgs/applications/version-management/git-and-tools/git-aggregator/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e437a6382747..15f5df047c9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1619,7 +1619,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - git-aggregator = callPackage ../development/tools/git-aggregator { }; + git-aggregator = callPackage ../applications/version-management/git-and-tools/git-aggregator { }; git-annex-metadata-gui = libsForQt5.callPackage ../applications/version-management/git-and-tools/git-annex-metadata-gui { inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter; From 5ffe526116a7b1b6a8721ccffe266d60a0aacece Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 07:01:34 -0300 Subject: [PATCH 02/23] git-backup: move to git-and-tools --- .../{ => git-and-tools}/git-backup/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/version-management/{ => git-and-tools}/git-backup/default.nix (100%) diff --git a/pkgs/applications/version-management/git-backup/default.nix b/pkgs/applications/version-management/git-and-tools/git-backup/default.nix similarity index 100% rename from pkgs/applications/version-management/git-backup/default.nix rename to pkgs/applications/version-management/git-and-tools/git-backup/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15f5df047c9e..a4220a1d1dd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1651,7 +1651,7 @@ with pkgs; git-appraise = callPackage ../applications/version-management/git-and-tools/git-appraise { }; - git-backup = callPackage ../applications/version-management/git-backup { + git-backup = callPackage ../applications/version-management/git-and-tools/git-backup { openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) Security; }; From f4c3e8fa5a7632726632fd3242e7403360e66fc0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 07:03:34 -0300 Subject: [PATCH 03/23] git-crecord: move to git-and-tools --- .../{ => git-and-tools}/git-crecord/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/version-management/{ => git-and-tools}/git-crecord/default.nix (100%) diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/applications/version-management/git-and-tools/git-crecord/default.nix similarity index 100% rename from pkgs/applications/version-management/git-crecord/default.nix rename to pkgs/applications/version-management/git-and-tools/git-crecord/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4220a1d1dd3..22520c82df5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1680,7 +1680,7 @@ with pkgs; git-cola = callPackage ../applications/version-management/git-and-tools/git-cola { }; - git-crecord = callPackage ../applications/version-management/git-crecord { }; + git-crecord = callPackage ../applications/version-management/git-and-tools/git-crecord { }; git-credential-1password = callPackage ../applications/version-management/git-and-tools/git-credential-1password { }; From 7601b8d8f5b8df5c2fa33c521564a697a45f88d4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 07:07:30 -0300 Subject: [PATCH 04/23] git-fire: move to git-and-tools --- .../version-management/git-and-tools}/git-fire/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{tools/misc => applications/version-management/git-and-tools}/git-fire/default.nix (100%) diff --git a/pkgs/tools/misc/git-fire/default.nix b/pkgs/applications/version-management/git-and-tools/git-fire/default.nix similarity index 100% rename from pkgs/tools/misc/git-fire/default.nix rename to pkgs/applications/version-management/git-and-tools/git-fire/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22520c82df5c..ac6cde79b59d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1698,7 +1698,7 @@ with pkgs; git-fast-export = callPackage ../applications/version-management/git-and-tools/fast-export { }; - git-fire = callPackage ../tools/misc/git-fire { }; + git-fire = callPackage ../applications/version-management/git-and-tools/git-fire { }; git-ftp = callPackage ../development/tools/git-ftp { }; From d5fdd6944279430c3152c796983b3ef3ed19f5de Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 07:40:50 -0300 Subject: [PATCH 05/23] git-ftp: move to git-and-tools --- .../version-management/git-and-tools}/git-ftp/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/tools => applications/version-management/git-and-tools}/git-ftp/default.nix (100%) diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/applications/version-management/git-and-tools/git-ftp/default.nix similarity index 100% rename from pkgs/development/tools/git-ftp/default.nix rename to pkgs/applications/version-management/git-and-tools/git-ftp/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac6cde79b59d..2e45719378a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1700,7 +1700,7 @@ with pkgs; git-fire = callPackage ../applications/version-management/git-and-tools/git-fire { }; - git-ftp = callPackage ../development/tools/git-ftp { }; + git-ftp = callPackage ../applications/version-management/git-and-tools/git-ftp { }; git-gone = callPackage ../applications/version-management/git-and-tools/git-gone { inherit (darwin.apple_sdk.frameworks) Security; From 019fac031aa7431def2ece7314775b9b41d68c11 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 07:58:32 -0300 Subject: [PATCH 06/23] git-hound: move to git-and-tools --- .../version-management/git-and-tools}/git-hound/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{tools/security => applications/version-management/git-and-tools}/git-hound/default.nix (100%) diff --git a/pkgs/tools/security/git-hound/default.nix b/pkgs/applications/version-management/git-and-tools/git-hound/default.nix similarity index 100% rename from pkgs/tools/security/git-hound/default.nix rename to pkgs/applications/version-management/git-and-tools/git-hound/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e45719378a7..351e8ef5bb21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1706,7 +1706,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - git-hound = callPackage ../tools/security/git-hound { }; + git-hound = callPackage ../applications/version-management/git-and-tools/git-hound { }; git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { }; From 5f3cf8eb59cdd3256f91bd6fdc2fd20a2496d24d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 08:13:03 -0300 Subject: [PATCH 07/23] git-lfs: move to git-and-tools --- .../version-management/{ => git-and-tools}/git-lfs/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/version-management/{ => git-and-tools}/git-lfs/default.nix (100%) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-and-tools/git-lfs/default.nix similarity index 100% rename from pkgs/applications/version-management/git-lfs/default.nix rename to pkgs/applications/version-management/git-and-tools/git-lfs/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 351e8ef5bb21..78f7f198841b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1718,7 +1718,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { }); + git-lfs = lowPrio (callPackage ../applications/version-management/git-and-tools/git-lfs { }); git-my = callPackage ../applications/version-management/git-and-tools/git-my { }; From 94250e8a63db11b3413e476d5a3c9e2e2981b3b1 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 08:16:50 -0300 Subject: [PATCH 08/23] git-privacy: move to git-and-tools --- .../version-management/git-and-tools}/git-privacy/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/tools => applications/version-management/git-and-tools}/git-privacy/default.nix (100%) diff --git a/pkgs/development/tools/git-privacy/default.nix b/pkgs/applications/version-management/git-and-tools/git-privacy/default.nix similarity index 100% rename from pkgs/development/tools/git-privacy/default.nix rename to pkgs/applications/version-management/git-and-tools/git-privacy/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78f7f198841b..2c99bf476732 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1732,7 +1732,7 @@ with pkgs; git-open = callPackage ../applications/version-management/git-and-tools/git-open { }; - git-privacy = callPackage ../development/tools/git-privacy { }; + git-privacy = callPackage ../applications/version-management/git-and-tools/git-privacy { }; git-publish = python3Packages.callPackage ../applications/version-management/git-and-tools/git-publish { }; From c2cb7d6ef64f9a7db688a397e2890bacb99099c1 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 08:23:28 -0300 Subject: [PATCH 09/23] git-quick-stats: move to git-and-tools --- .../git-and-tools}/git-quick-stats/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/tools => applications/version-management/git-and-tools}/git-quick-stats/default.nix (100%) diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/applications/version-management/git-and-tools/git-quick-stats/default.nix similarity index 100% rename from pkgs/development/tools/git-quick-stats/default.nix rename to pkgs/applications/version-management/git-and-tools/git-quick-stats/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c99bf476732..9cd9535bc54e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1736,7 +1736,7 @@ with pkgs; git-publish = python3Packages.callPackage ../applications/version-management/git-and-tools/git-publish { }; - git-quick-stats = callPackage ../development/tools/git-quick-stats { }; + git-quick-stats = callPackage ../applications/version-management/git-and-tools/git-quick-stats { }; git-quickfix = callPackage ../applications/version-management/git-and-tools/git-quickfix { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; From 08b72ebbb28562cb82ee2f36ca670ef329941ada Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 08:26:08 -0300 Subject: [PATCH 10/23] git-repo-updater: move to git-and-tools --- .../git-and-tools}/git-repo-updater/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/tools => applications/version-management/git-and-tools}/git-repo-updater/default.nix (100%) diff --git a/pkgs/development/tools/git-repo-updater/default.nix b/pkgs/applications/version-management/git-and-tools/git-repo-updater/default.nix similarity index 100% rename from pkgs/development/tools/git-repo-updater/default.nix rename to pkgs/applications/version-management/git-and-tools/git-repo-updater/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cd9535bc54e..3426b7565a2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1750,7 +1750,7 @@ with pkgs; git-remote-codecommit = python3Packages.callPackage ../applications/version-management/git-and-tools/git-remote-codecommit { }; - git-repo-updater = python3Packages.callPackage ../development/tools/git-repo-updater { }; + git-repo-updater = python3Packages.callPackage ../applications/version-management/git-and-tools/git-repo-updater { }; git-review = python3Packages.callPackage ../applications/version-management/git-review { }; From 83b058e95bc92c3ac32fa6c373d013c6dc571eb1 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 08:33:55 -0300 Subject: [PATCH 11/23] git-repo: move to git-and-tools Also add a legacy alias. --- .../{ => git-and-tools}/git-repo/default.nix | 0 .../{ => git-and-tools}/git-repo/import-ssl-module.patch | 0 pkgs/top-level/all-packages.nix | 5 +++-- 3 files changed, 3 insertions(+), 2 deletions(-) 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%) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-repo/default.nix similarity index 100% rename from pkgs/applications/version-management/git-repo/default.nix rename to pkgs/applications/version-management/git-and-tools/git-repo/default.nix diff --git a/pkgs/applications/version-management/git-repo/import-ssl-module.patch b/pkgs/applications/version-management/git-and-tools/git-repo/import-ssl-module.patch similarity index 100% rename from pkgs/applications/version-management/git-repo/import-ssl-module.patch rename to pkgs/applications/version-management/git-and-tools/git-repo/import-ssl-module.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3426b7565a2e..7058151a982d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1750,6 +1750,9 @@ with pkgs; git-remote-codecommit = python3Packages.callPackage ../applications/version-management/git-and-tools/git-remote-codecommit { }; + gitRepo = git-repo; + git-repo = callPackage ../applications/version-management/git-and-tools/git-repo { }; + git-repo-updater = python3Packages.callPackage ../applications/version-management/git-and-tools/git-repo-updater { }; git-review = python3Packages.callPackage ../applications/version-management/git-review { }; @@ -1812,8 +1815,6 @@ with pkgs; git2cl = callPackage ../applications/version-management/git-and-tools/git2cl { }; - gitRepo = callPackage ../applications/version-management/git-repo { }; - gitbatch = callPackage ../applications/version-management/git-and-tools/gitbatch { }; gitflow = callPackage ../applications/version-management/git-and-tools/gitflow { }; From 072e8e4403ed9194b24a616e1be7f64c6d4d8927 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 22:03:03 -0300 Subject: [PATCH 12/23] git-review: move to git-and-tools --- .../{ => git-and-tools}/git-review/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/version-management/{ => git-and-tools}/git-review/default.nix (100%) diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-and-tools/git-review/default.nix similarity index 100% rename from pkgs/applications/version-management/git-review/default.nix rename to pkgs/applications/version-management/git-and-tools/git-review/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7058151a982d..a310e902b4d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1755,7 +1755,7 @@ with pkgs; git-repo-updater = python3Packages.callPackage ../applications/version-management/git-and-tools/git-repo-updater { }; - git-review = python3Packages.callPackage ../applications/version-management/git-review { }; + git-review = python3Packages.callPackage ../applications/version-management/git-and-tools/git-review { }; git-remote-gcrypt = callPackage ../applications/version-management/git-and-tools/git-remote-gcrypt { }; From 4f7ca6ba792adecd397a95f38527e85b0906d043 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 22:06:33 -0300 Subject: [PATCH 13/23] git-series: move to git-and-tools --- .../version-management/git-and-tools}/git-series/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/tools => applications/version-management/git-and-tools}/git-series/default.nix (100%) diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/applications/version-management/git-and-tools/git-series/default.nix similarity index 100% rename from pkgs/development/tools/git-series/default.nix rename to pkgs/applications/version-management/git-and-tools/git-series/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a310e902b4d5..5268a5548611 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1767,7 +1767,7 @@ with pkgs; git-secrets = callPackage ../applications/version-management/git-and-tools/git-secrets { }; - git-series = callPackage ../development/tools/git-series { + git-series = callPackage ../applications/version-management/git-and-tools/git-series { openssl = openssl_1_1; }; From 18df6097bd2f7ef59f71fd5e92f68f116ca4e9bc Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 22:09:18 -0300 Subject: [PATCH 14/23] git-sizer: move to git-and-tools --- .../{ => git-and-tools}/git-sizer/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/version-management/{ => git-and-tools}/git-sizer/default.nix (100%) diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-and-tools/git-sizer/default.nix similarity index 100% rename from pkgs/applications/version-management/git-sizer/default.nix rename to pkgs/applications/version-management/git-and-tools/git-sizer/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5268a5548611..cd40d36ef530 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1771,7 +1771,7 @@ with pkgs; openssl = openssl_1_1; }; - git-sizer = callPackage ../applications/version-management/git-sizer { }; + git-sizer = callPackage ../applications/version-management/git-and-tools/git-sizer { }; git-standup = callPackage ../applications/version-management/git-and-tools/git-standup { }; From 16aa4709eb3a5463f5f1e7033e66bf0c67accb63 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 22:12:19 -0300 Subject: [PATCH 15/23] git-town: move to git-and-tools --- .../version-management/git-and-tools}/git-town/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{tools/misc => applications/version-management/git-and-tools}/git-town/default.nix (100%) diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/applications/version-management/git-and-tools/git-town/default.nix similarity index 100% rename from pkgs/tools/misc/git-town/default.nix rename to pkgs/applications/version-management/git-and-tools/git-town/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd40d36ef530..90d483ef8da5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1792,7 +1792,7 @@ with pkgs; git-test = callPackage ../applications/version-management/git-and-tools/git-test { }; - git-town = callPackage ../tools/misc/git-town { }; + git-town = callPackage ../applications/version-management/git-and-tools/git-town { }; git-trim = callPackage ../applications/version-management/git-and-tools/git-trim { openssl = openssl_1_1; From 6d744e7d9613a2ee1ed98f403b9846412963fe16 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 22:41:13 -0300 Subject: [PATCH 16/23] git-up: move to git-and-tools --- .../version-management/{ => git-and-tools}/git-up/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/version-management/{ => git-and-tools}/git-up/default.nix (100%) diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-and-tools/git-up/default.nix similarity index 100% rename from pkgs/applications/version-management/git-up/default.nix rename to pkgs/applications/version-management/git-and-tools/git-up/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90d483ef8da5..bab69de0df60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1799,7 +1799,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - git-up = callPackage ../applications/version-management/git-up { + git-up = callPackage ../applications/version-management/git-and-tools/git-up { pythonPackages = python3Packages; }; From 7389c44bcdc3bb02088dc0460351bd3ca96526ca Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 22:46:10 -0300 Subject: [PATCH 17/23] gitless: move to git-and-tools --- .../version-management/{ => git-and-tools}/gitless/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/version-management/{ => git-and-tools}/gitless/default.nix (100%) diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/git-and-tools/gitless/default.nix similarity index 100% rename from pkgs/applications/version-management/gitless/default.nix rename to pkgs/applications/version-management/git-and-tools/gitless/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bab69de0df60..12752d2015a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1821,7 +1821,7 @@ with pkgs; gitfs = callPackage ../tools/filesystems/gitfs { }; - gitless = callPackage ../applications/version-management/gitless { }; + gitless = callPackage ../applications/version-management/git-and-tools/gitless { }; gitlint = python3Packages.callPackage ../tools/misc/gitlint { }; From fd4fa062b495985982e13c5369b546bbd008ff6e Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 22:49:52 -0300 Subject: [PATCH 18/23] gitlint: move to git-and-tools --- .../version-management/git-and-tools}/gitlint/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{tools/misc => applications/version-management/git-and-tools}/gitlint/default.nix (100%) diff --git a/pkgs/tools/misc/gitlint/default.nix b/pkgs/applications/version-management/git-and-tools/gitlint/default.nix similarity index 100% rename from pkgs/tools/misc/gitlint/default.nix rename to pkgs/applications/version-management/git-and-tools/gitlint/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12752d2015a3..e793f37bfb31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1823,7 +1823,7 @@ with pkgs; gitless = callPackage ../applications/version-management/git-and-tools/gitless { }; - gitlint = python3Packages.callPackage ../tools/misc/gitlint { }; + gitlint = python3Packages.callPackage ../applications/version-management/git-and-tools/gitlint { }; gitls = callPackage ../tools/security/gitls { }; From b8cee524136183bc57e45ffe07abac7c6189fb58 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 22:52:24 -0300 Subject: [PATCH 19/23] gitls: move to git-and-tools --- .../version-management/git-and-tools}/gitls/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{tools/security => applications/version-management/git-and-tools}/gitls/default.nix (100%) diff --git a/pkgs/tools/security/gitls/default.nix b/pkgs/applications/version-management/git-and-tools/gitls/default.nix similarity index 100% rename from pkgs/tools/security/gitls/default.nix rename to pkgs/applications/version-management/git-and-tools/gitls/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e793f37bfb31..37084d51e4c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1825,7 +1825,7 @@ with pkgs; gitlint = python3Packages.callPackage ../applications/version-management/git-and-tools/gitlint { }; - gitls = callPackage ../tools/security/gitls { }; + gitls = callPackage ../applications/version-management/git-and-tools/gitls { }; gitnuro = callPackage ../applications/version-management/git-and-tools/gitnuro { }; From 690da77e6523fe3e2aa3ae9597e8103524dda6bb Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 22:53:41 -0300 Subject: [PATCH 20/23] gitoxide: move to git-and-tools --- .../version-management/{ => git-and-tools}/gitoxide/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/version-management/{ => git-and-tools}/gitoxide/default.nix (100%) diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/git-and-tools/gitoxide/default.nix similarity index 100% rename from pkgs/applications/version-management/gitoxide/default.nix rename to pkgs/applications/version-management/git-and-tools/gitoxide/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37084d51e4c5..2906fe435b6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1600,7 +1600,7 @@ with pkgs; gita = python3Packages.callPackage ../applications/version-management/git-and-tools/gita { }; - gitoxide = callPackage ../applications/version-management/gitoxide { + gitoxide = callPackage ../applications/version-management/git-and-tools/gitoxide { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; From 31087568fcac0066b5010e02a6734d5d27550ec0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 23:10:44 -0300 Subject: [PATCH 21/23] gitsign: move to git-and-tools --- .../version-management/git-and-tools}/gitsign/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{tools/security => applications/version-management/git-and-tools}/gitsign/default.nix (100%) diff --git a/pkgs/tools/security/gitsign/default.nix b/pkgs/applications/version-management/git-and-tools/gitsign/default.nix similarity index 100% rename from pkgs/tools/security/gitsign/default.nix rename to pkgs/applications/version-management/git-and-tools/gitsign/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2906fe435b6b..99abb849df54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1829,7 +1829,7 @@ with pkgs; gitnuro = callPackage ../applications/version-management/git-and-tools/gitnuro { }; - gitsign = callPackage ../tools/security/gitsign { }; + gitsign = callPackage ../applications/version-management/git-and-tools/gitsign { }; gitstats = callPackage ../applications/version-management/gitstats { }; From f6feed1fd304731b3e39fec9fea4ab6327efc889 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 23:14:20 -0300 Subject: [PATCH 22/23] gitstats: move to git-and-tools --- .../version-management/{ => git-and-tools}/gitstats/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/version-management/{ => git-and-tools}/gitstats/default.nix (100%) diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/applications/version-management/git-and-tools/gitstats/default.nix similarity index 100% rename from pkgs/applications/version-management/gitstats/default.nix rename to pkgs/applications/version-management/git-and-tools/gitstats/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99abb849df54..b47f3153b8d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1831,7 +1831,7 @@ with pkgs; gitsign = callPackage ../applications/version-management/git-and-tools/gitsign { }; - gitstats = callPackage ../applications/version-management/gitstats { }; + gitstats = callPackage ../applications/version-management/git-and-tools/gitstats { }; gitstatus = callPackage ../applications/version-management/git-and-tools/gitstatus { }; From 2e1413a0570fc01085a5a2d8b9101bff2e2813db Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Dec 2022 23:16:48 -0300 Subject: [PATCH 23/23] josh: move to git-and-tools --- .../version-management/{ => git-and-tools}/josh/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/version-management/{ => git-and-tools}/josh/default.nix (100%) diff --git a/pkgs/applications/version-management/josh/default.nix b/pkgs/applications/version-management/git-and-tools/josh/default.nix similarity index 100% rename from pkgs/applications/version-management/josh/default.nix rename to pkgs/applications/version-management/git-and-tools/josh/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b47f3153b8d7..7f30247a59c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1853,7 +1853,7 @@ with pkgs; hut = callPackage ../applications/version-management/git-and-tools/hut { }; - josh = callPackage ../applications/version-management/josh { }; + josh = callPackage ../applications/version-management/git-and-tools/josh { }; lab = callPackage ../applications/version-management/git-and-tools/lab { };