From 1ca832be87ca086f10ebea49ec1abd396520888a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Apr 2011 17:53:39 +0000 Subject: [PATCH] git-and-tools: dropped support for getConfig -- use override instead! See my earlier commit that dropped getConfig support from subversion. svn path=/nixpkgs/trunk/; revision=26829 --- .../version-management/git-and-tools/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 081ee7d2d69..baa8e74b5bd 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -4,7 +4,6 @@ args: with args; with pkgs; let inherit (pkgs) stdenv fetchurl subversion; - config = param: getConfig [ "git" param ]; in rec { @@ -12,9 +11,9 @@ rec { 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; - svnSupport = config "svnSupport" false; # for git-svn support - guiSupport = config "guiSupport" false; - sendEmailSupport = config "sendEmailSupport" false; + svnSupport = false; # for git-svn support + guiSupport = false; # requires tcl/tk + sendEmailSupport = false; # requires plenty of perl libraries perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey]; smtpPerlLibs = [ perlPackages.NetSMTP perlPackages.NetSMTPSSL @@ -41,8 +40,8 @@ rec { asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl tk makeWrapper subversion autoconf; - svnSupport = config "svnSupport" false; # for git-svn support - guiSupport = config "guiSupport" false; + svnSupport = false; + guiSupport = false; perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion]; };