Author: urkud
Date: Wed Sep 7 22:52:52 2011
New Revision: 29102
URL: https://svn.nixos.org/websvn/nix/?rev=29102&sc=1
Log:
git doesn't need subversion server
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Wed Sep 7 20:36:13 2011 (r29101)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Wed Sep 7 22:52:52 2011 (r29102)
@@ -10,7 +10,7 @@
git = lib.makeOverridable (import ./git) {
inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
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
guiSupport = false; # requires tcl/tk
sendEmailSupport = false; # requires plenty of perl libraries
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
Wed Sep 7 20:36:13 2011 (r29101)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
Wed Sep 7 22:52:52 2011 (r29102)
@@ -1,14 +1,14 @@
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio,
gnugrep
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
, libxslt, tcl, tk, makeWrapper
-, svnSupport, subversion, perlLibs, smtpPerlLibs
+, svnSupport, subversionClient, perlLibs, smtpPerlLibs
, guiSupport
, pythonSupport ? true
, sendEmailSupport
}:
let
- svn = subversion.override { perlBindings = true; };
+ svn = subversionClient.override { perlBindings = true; };
in
stdenv.mkDerivation rec {
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
