@@ -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 };
@@ -127,6 +114,8 @@ let
127114 utillinux = if stdenv.isLinux then utillinuxMinimal else utillinux;
128115 };
129116
117+ git-remote-gcrypt = callPackage ./git-remote-gcrypt { };
118+
130119 git-remote-hg = callPackage ./git-remote-hg { };
131120
132121 git-reparent = callPackage ./git-reparent { };
@@ -153,9 +142,20 @@ let
153142
154143 git2cl = callPackage ./git2cl { };
155144
156− git-fast-export = callPackage ./fast-export { };
145+ # The full-featured Git.
146+ gitFull = gitBase.override {
147+ svnSupport = true;
148+ guiSupport = true;
149+ sendEmailSupport = true;
150+ withLibsecret = !stdenv.isDarwin;
151+ };
157152
158− git-remote-gcrypt = callPackage ./git-remote-gcrypt { };
153+ # Git with SVN support, but without GUI.
154+ gitSVN = lowPrio (appendToName "with-svn" (gitBase.override {
155+ svnSupport = true;
156+ }));
157+
158+ gita = python3Packages.callPackage ./gita {};
159159
160160 gitflow = callPackage ./gitflow { };
161161
@@ -171,23 +171,22 @@ let
171171
172172 lefthook = callPackage ./lefthook { };
173173
174− pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit;
175−
176174 pass-git-helper = python3Packages.callPackage ./pass-git-helper { };
177175
176+ pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit;
177+
178178 qgit = qt5.callPackage ./qgit { };
179179
180− stgit = callPackage ./stgit {
181− };
180+ stgit = callPackage ./stgit { };
182181
183182 subgit = callPackage ./subgit { };
184183
184+ svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { };
185+
185186 svn2git = callPackage ./svn2git {
186187 git = gitSVN;
187188 };
188189
189− svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { };
190−
191190 thicket = callPackage ./thicket { };
192191
193192 tig = callPackage ./tig { };