Author: simons
Date: Wed Apr 13 17:53:39 2011
New Revision: 26829
URL: https://svn.nixos.org/websvn/nix/?rev=26829&sc=1
Log:
git-and-tools: dropped support for getConfig -- use override instead!
See my earlier commit that dropped getConfig support from subversion.
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/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 Apr 13 17:53:33 2011 (r26828)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Wed Apr 13 17:53:39 2011 (r26829)
@@ -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 @@
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 @@
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];
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
