diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-24 06:29:09 +0000 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-24 06:29:09 +0000 |
| commit | bde20f3e881049c9d019eb34c07d6194b20b0042 (patch) | |
| tree | f24782e55ca68a214d0fe7585097d97a6aa687dd /pkgs/applications/version-management/git-and-tools/default.nix | |
| parent | 6a29a56c1277d80aa65e063f34a179c847e6d8b4 (diff) | |
| parent | 50d66b945ee5aceae2bbf2eb791487e18ac9d374 (diff) | |
| download | nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.tar nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.tar.gz nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.tar.bz2 nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.tar.lz nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.tar.xz nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.tar.zst nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.zip | |
Merge branch 'master' into x-updates
Conflicts (just taken x-updates): pkgs/servers/x11/xorg/overrides.nix
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools/default.nix')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index b6d7c1eb5d3b..a5aeb1bf6a41 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -10,7 +10,7 @@ rec { 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 subversionClient hardlink; + cpio tcl tk makeWrapper subversionClient gzip; svnSupport = false; # for git-svn support guiSupport = false; # requires tcl/tk sendEmailSupport = false; # requires plenty of perl libraries |