public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "optionally apply git glob patch to default git"

Browse Source 
Please submit patches *upstream*.

svn path=/nixpkgs/trunk/; revision=17466
This commit is contained in:
Peter Simons 2009-09-28 12:56:46 +00:00
parent 9cd0893306
commit ad7eebbad1
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -15,7 +15,6 @@ rec {
cpio tcl tk makeWrapper subversion; cpio tcl tk makeWrapper subversion;
svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
guiSupport = getConfig ["git" "guiSupport"] false; guiSupport = getConfig ["git" "guiSupport"] false;
gitkGlobSupport = getConfig ["git" "gitkGlobSupport"] false;
perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion]; perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion];
}; };

8
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -3,7 +3,6 @@
, libxslt, tcl, tk, makeWrapper , libxslt, tcl, tk, makeWrapper
, svnSupport, subversion, perlLibs , svnSupport, subversion, perlLibs
, guiSupport , guiSupport
, gitkGlobSupport
}: }:
# `git-svn' support requires Subversion and various Perl libraries. # `git-svn' support requires Subversion and various Perl libraries.
@ -17,12 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "fc7e4d6c4172c62c93d5e974019f7193b03c8bc0a1c6f3a9fcc1d0928b808d7a"; sha256 = "fc7e4d6c4172c62c93d5e974019f7193b03c8bc0a1c6f3a9fcc1d0928b808d7a";
}; };
patches = [ ./docbook2texi.patch ] 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";
});
buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] buildInputs = [curl openssl zlib expat gettext cpio makeWrapper]
++ # documentation tools ++ # documentation tools