git doesn't need subversion server

svn path=/nixpkgs/trunk/; revision=29102
This commit is contained in:
Yury G. Kudryashov 2011-09-07 22:52:52 +00:00
parent c292d234ea
commit fcec1593b8
2 changed files with 3 additions and 3 deletions

View File

@ -10,7 +10,7 @@ rec {
git = lib.makeOverridable (import ./git) { git = lib.makeOverridable (import ./git) {
inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt
cpio tcl tk makeWrapper subversion; cpio tcl tk makeWrapper subversionClient;
svnSupport = false; # for git-svn support svnSupport = false; # for git-svn support
guiSupport = false; # requires tcl/tk guiSupport = false; # requires tcl/tk
sendEmailSupport = false; # requires plenty of perl libraries sendEmailSupport = false; # requires plenty of perl libraries

View File

@ -1,14 +1,14 @@
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
, libxslt, tcl, tk, makeWrapper , libxslt, tcl, tk, makeWrapper
, svnSupport, subversion, perlLibs, smtpPerlLibs , svnSupport, subversionClient, perlLibs, smtpPerlLibs
, guiSupport , guiSupport
, pythonSupport ? true , pythonSupport ? true
, sendEmailSupport , sendEmailSupport
}: }:
let let
svn = subversion.override { perlBindings = true; }; svn = subversionClient.override { perlBindings = true; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {