git-and-tools: move to callPackage

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