@@ -24,7 +24,7 @@ let
2424
2525 bump2version = pkgs.python37Packages.callPackage ./bump2version { };
2626
27− darcsToGit = callPackage ./darcs-to-git { };
27+ darcs-to-git = callPackage ./darcs-to-git { };
2828
2929 delta = callPackage ./delta { };
3030
@@ -40,29 +40,6 @@ let
4040 inherit (darwin.apple_sdk.frameworks) Security;
4141 };
4242
43− git-appraise = callPackage ./git-appraise {};
44−
45− git-fame = callPackage ./git-fame {};
46−
47− git-filter-repo = callPackage ./git-filter-repo {
48− pythonPackages = python3Packages;
49− };
50−
51− gita = python3Packages.callPackage ./gita {};
52−
53− # The full-featured Git.
54− gitFull = gitBase.override {
55− svnSupport = true;
56− guiSupport = true;
57− sendEmailSupport = true;
58− withLibsecret = !stdenv.isDarwin;
59− };
60−
61− # Git with SVN support, but without GUI.
62− gitSVN = lowPrio (appendToName "with-svn" (gitBase.override {
63− svnSupport = true;
64− }));
65−
6643 git-annex = pkgs.haskellPackages.git-annex;
6744
6845 git-annex-metadata-gui = libsForQt5.callPackage ./git-annex-metadata-gui {
@@ -84,6 +61,8 @@ let
8461
8562 git-annex-utils = callPackage ./git-annex-utils { };
8663
64+ git-appraise = callPackage ./git-appraise {};
65+
8766 git-bug = callPackage ./git-bug { };
8867
8968 # support for bugzilla
@@ -101,6 +80,14 @@ let
10180
10281 git-extras = callPackage ./git-extras { };
10382
83+ git-fame = callPackage ./git-fame {};
84+
85+ git-fast-export = callPackage ./fast-export { };
86+
87+ git-filter-repo = callPackage ./git-filter-repo {
88+ pythonPackages = python3Packages;
89+ };
90+
10491 git-gone = callPackage ./git-gone {
10592 inherit (darwin.apple_sdk.frameworks) Security;
10693 };
@@ -117,6 +104,8 @@ let
117104
118105 git-machete = python3Packages.callPackage ./git-machete { };
119106
107+ git-my = callPackage ./git-my { };
108+
120109 git-octopus = callPackage ./git-octopus { };
121110
122111 git-open = callPackage ./git-open { };
@@ -127,6 +116,8 @@ let
127116 utillinux = if stdenv.isLinux then utillinuxMinimal else utillinux;
128117 };
129118
119+ git-remote-gcrypt = callPackage ./git-remote-gcrypt { };
120+
130121 git-remote-hg = callPackage ./git-remote-hg { };
131122
132123 git-reparent = callPackage ./git-reparent { };
@@ -153,9 +144,20 @@ let
153144
154145 git2cl = callPackage ./git2cl { };
155146
156− gitFastExport = callPackage ./fast-export { };
147+ # The full-featured Git.
148+ gitFull = gitBase.override {
149+ svnSupport = true;
150+ guiSupport = true;
151+ sendEmailSupport = true;
152+ withLibsecret = !stdenv.isDarwin;
153+ };
154+
155+ # Git with SVN support, but without GUI.
156+ gitSVN = lowPrio (appendToName "with-svn" (gitBase.override {
157+ svnSupport = true;
158+ }));
157159
158− gitRemoteGcrypt = callPackage ./git-remote-gcrypt { };
160+ gita = python3Packages.callPackage ./gita {};
159161
160162 gitflow = callPackage ./gitflow { };
161163
@@ -167,34 +169,31 @@ let
167169 inherit (darwin) Security;
168170 };
169171
170− hubUnstable = throw "use gitAndTools.hub instead";
171−
172172 lab = callPackage ./lab { };
173173
174174 lefthook = callPackage ./lefthook { };
175175
176− pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit;
177−
178176 pass-git-helper = python3Packages.callPackage ./pass-git-helper { };
179177
178+ pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit;
179+
180180 qgit = qt5.callPackage ./qgit { };
181181
182− stgit = callPackage ./stgit {
183− };
182+ stgit = callPackage ./stgit { };
184183
185184 subgit = callPackage ./subgit { };
186185
186+ svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { };
187+
187188 svn2git = callPackage ./svn2git {
188189 git = gitSVN;
189190 };
190191
191− svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { };
192−
193192 thicket = callPackage ./thicket { };
194193
195194 tig = callPackage ./tig { };
196195
197− topGit = callPackage ./topgit { };
196+ top-git = callPackage ./topgit { };
198197
199198 transcrypt = callPackage ./transcrypt { };
200199
@@ -202,8 +201,12 @@ let
202201
203202} // lib.optionalAttrs (config.allowAliases or true) (with self; {
204203 # aliases
204+ darcsToGit = darcs-to-git;
205205 gitAnnex = git-annex;
206+ gitFastExport = git-fast-export;
207+ gitRemoteGcrypt = git-remote-gcrypt;
206208 svn_all_fast_export = svn-all-fast-export;
209+ topGit = top-git;
207210});
208211in
209212 self