Revert "optionally apply git glob patch to default git"

Please submit patches *upstream*.

svn path=/nixpkgs/trunk/; revision=17466

2 files changed, 1 insertions, 8 deletions

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index d48319a9945a..b9e201f4fd84 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -15,7 +15,6 @@ rec {
       cpio tcl tk makeWrapper subversion;
     svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
     guiSupport = getConfig ["git" "guiSupport"] false;
-    gitkGlobSupport = getConfig ["git" "gitkGlobSupport"] false;
     perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion];
   };
 
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index b94868b14710..423c6d2b669a 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -3,7 +3,6 @@
 , libxslt, tcl, tk, makeWrapper
 , svnSupport, subversion, perlLibs
 , guiSupport
-, gitkGlobSupport
 }:
 
 # `git-svn' support requires Subversion and various Perl libraries.
@@ -17,12 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "fc7e4d6c4172c62c93d5e974019f7193b03c8bc0a1c6f3a9fcc1d0928b808d7a";
   };
 
-  patches = [ ./docbook2texi.patch ]
-      ++ # adds possibility to highlight all changes to files matching a glob pattern
-          stdenv.lib.optional (guiSupport && gitkGlobSupport) (fetchurl {
-          url = "http://mawercer.de/~marc/git-jrnieder.patch";
-          sha256 = "187wf8chdjifwh3rrdc80nkak08jk7n74xq1bfzr2bhx2wicrv0x";
-          });
+  patches = [ ./docbook2texi.patch ];
 
   buildInputs = [curl openssl zlib expat gettext cpio makeWrapper]
     ++ # documentation tools