pyrox.dev
git-and-tools: move to callPackage
+9
-32
pkgs/applications/version-management/git-and-tools/default.nix
+9
-32
pkgs/applications/version-management/git-and-tools/default.nix
···
3
3
*/
4
4
args @ {pkgs}: with args; with pkgs;
5
5
let
6
-
inherit (pkgs) stdenv fetchgit fetchurl subversion;
7
-
8
-
gitBase = lib.makeOverridable (import ./git) {
9
-
inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
10
-
asciidoc xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl
11
-
tk makeWrapper subversionClient gzip openssh libiconv;
6
+
gitBase = callPackage ./git {
12
7
texinfo = texinfo5;
13
8
svnSupport = false; # for git-svn support
14
9
guiSupport = false; # requires tcl/tk
···
64
59
65
60
git-stree = callPackage ./git-stree { };
66
61
67
-
git2cl = import ./git2cl {
68
-
inherit fetchgit stdenv perl;
69
-
};
62
+
git2cl = callPackage ./git2cl { };
70
63
71
-
gitFastExport = import ./fast-export {
72
-
inherit fetchgit stdenv mercurial coreutils git makeWrapper subversion;
73
-
};
64
+
gitFastExport = callPackage ./fast-export { };
74
65
75
66
gitRemoteGcrypt = callPackage ./git-remote-gcrypt { };
76
67
77
68
gitflow = callPackage ./gitflow { };
78
69
79
-
hub = import ./hub {
80
-
inherit go;
81
-
inherit stdenv fetchgit;
70
+
hub = callPackage ./hub {
82
71
inherit (darwin) Security;
83
72
};
84
73
85
-
qgit = import ./qgit {
86
-
inherit fetchurl stdenv;
87
-
inherit (xorg) libXext libX11;
88
-
qt = qt4;
89
-
};
74
+
qgit = callPackage ./qgit { };
90
75
91
-
qgitGit = import ./qgit/qgit-git.nix {
92
-
inherit fetchurl sourceFromHead stdenv;
93
-
inherit (xorg) libXext libX11;
94
-
qt = qt4;
95
-
};
76
+
qgitGit = callPackage ./qgit/qgit-git.nix { };
96
77
97
-
stgit = import ./stgit {
98
-
inherit fetchurl stdenv python git;
78
+
stgit = callPackage ./stgit {
99
79
};
100
80
101
81
subgit = callPackage ./subgit { };
102
82
103
-
svn2git = import ./svn2git {
104
-
inherit stdenv fetchurl ruby makeWrapper;
83
+
svn2git = callPackage ./svn2git {
105
84
git = gitSVN;
106
85
};
107
86
···
109
88
110
89
tig = callPackage ./tig { };
111
90
112
-
topGit = lib.makeOverridable (import ./topgit) {
113
-
inherit stdenv fetchurl;
114
-
};
91
+
topGit = callPackage ./topgit { };
115
92
116
93
transcrypt = callPackage ./transcrypt { };
117
94
}