diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 3e6a838b499..74b45db14a1 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -11,11 +11,11 @@ assert svnSupport -> (subversion != null && perlLibs != []); stdenv.mkDerivation rec { - name = "git-1.5.5"; + name = "git-1.5.6.1"; src = fetchurl { url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; - sha256 = "0pp6hfxkcwzb415wkkn713pqsv7cv06y90s53dyhsicqqn83hj17"; + sha256 = "11k5d986y9clmb2lywkdv1g1gybz38irmcp4rx8l4jfmk7l62sh7"; }; patches = [ ./pwd.patch ./docbook2texi.patch ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ensureDir $out/share/emacs/site-lisp cp -p contrib/emacs/*.el $out/share/emacs/site-lisp '' # */ - + + (if svnSupport then ''# wrap git-svn diff --git a/pkgs/applications/version-management/git/pwd.patch b/pkgs/applications/version-management/git/pwd.patch index 78c67043913..57ba4d140a6 100644 --- a/pkgs/applications/version-management/git/pwd.patch +++ b/pkgs/applications/version-management/git/pwd.patch @@ -1,17 +1,7 @@ ---- git-1.5.4.4/git-clone.sh 2008-03-09 11:18:13.000000000 +0100 -+++ git-1.5.4.4/git-clone.sh 2008-03-30 23:43:35.000000000 +0200 -@@ -40,7 +40,7 @@ eval "$(echo "$OPTIONS_SPEC" | git rev-p - - get_repo_base() { - ( -- cd "`/bin/pwd`" && -+ cd "`pwd`" && - cd "$1" || cd "$1.git" && - { - cd .git ---- git-1.5.4.4/git-submodule.sh 2008-03-09 11:18:13.000000000 +0100 -+++ git-1.5.4.4/git-submodule.sh 2008-03-31 00:01:03.000000000 +0200 -@@ -28,7 +28,7 @@ say() +diff -ubr git-1.5.6.1-orig/git-submodule.sh git-1.5.6.1/git-submodule.sh +--- git-1.5.6.1-orig/git-submodule.sh 2008-06-28 16:28:54.000000000 +0200 ++++ git-1.5.6.1/git-submodule.sh 2008-06-28 16:29:55.000000000 +0200 +@@ -30,7 +30,7 @@ # NEEDSWORK: identical function exists in get_repo_base in clone.sh get_repo_base() { (