public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-and-tools: move to callPackage

This commit is contained in:
Nikolay Amiantov 2016-04-17 02:41:47 +03:00
parent fb2c651647
commit 661641aeb7
1 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -3,12 +3,7 @@
*/ */
args @ {pkgs}: with args; with pkgs; args @ {pkgs}: with args; with pkgs;
let let
inherit (pkgs) stdenv fetchgit fetchurl subversion; gitBase = callPackage ./git {
gitBase = lib.makeOverridable (import ./git) {
inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
asciidoc xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl
tk makeWrapper subversionClient gzip openssh libiconv;
texinfo = texinfo5; texinfo = texinfo5;
svnSupport = false; # for git-svn support svnSupport = false; # for git-svn support
guiSupport = false; # requires tcl/tk guiSupport = false; # requires tcl/tk
@ -64,44 +59,28 @@ rec {
git-stree = callPackage ./git-stree { }; git-stree = callPackage ./git-stree { };
git2cl = import ./git2cl { git2cl = callPackage ./git2cl { };
inherit fetchgit stdenv perl;
};
gitFastExport = import ./fast-export { gitFastExport = callPackage ./fast-export { };
inherit fetchgit stdenv mercurial coreutils git makeWrapper subversion;
};
gitRemoteGcrypt = callPackage ./git-remote-gcrypt { }; gitRemoteGcrypt = callPackage ./git-remote-gcrypt { };
gitflow = callPackage ./gitflow { }; gitflow = callPackage ./gitflow { };
hub = import ./hub { hub = callPackage ./hub {
inherit go;
inherit stdenv fetchgit;
inherit (darwin) Security; inherit (darwin) Security;
}; };
qgit = import ./qgit { qgit = callPackage ./qgit { };
inherit fetchurl stdenv;
inherit (xorg) libXext libX11;
qt = qt4;
};
qgitGit = import ./qgit/qgit-git.nix { qgitGit = callPackage ./qgit/qgit-git.nix { };
inherit fetchurl sourceFromHead stdenv;
inherit (xorg) libXext libX11;
qt = qt4;
};
stgit = import ./stgit { stgit = callPackage ./stgit {
inherit fetchurl stdenv python git;
}; };
subgit = callPackage ./subgit { }; subgit = callPackage ./subgit { };
svn2git = import ./svn2git { svn2git = callPackage ./svn2git {
inherit stdenv fetchurl ruby makeWrapper;
git = gitSVN; git = gitSVN;
}; };
@ -109,9 +88,7 @@ rec {
tig = callPackage ./tig { }; tig = callPackage ./tig { };
topGit = lib.makeOverridable (import ./topgit) { topGit = callPackage ./topgit { };
inherit stdenv fetchurl;
};
transcrypt = callPackage ./transcrypt { }; transcrypt = callPackage ./transcrypt { };
} }