diff options
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools/default.nix')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 3f1593899c15..c6b29d8ae26f 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -48,8 +48,9 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which; inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc - HTTP testpack monadControl hS3 mtl network hslogger hxt json; + HTTP testpack hS3 mtl network hslogger hxt json; QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1; + monadControl = haskellPackages.monadControl_OBSOLETE; }; qgit = import ./qgit { @@ -100,7 +101,8 @@ rec { }; svn2git = import ./svn2git { - inherit stdenv fetchgit qt47 subversion apr; + inherit stdenv fetchgit ruby makeWrapper; + git = gitSVN; }; gitSubtree = import ./git-subtree { |