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

git: updated to version 1.5.6.1

Browse Source 
svn path=/nixpkgs/trunk/; revision=12208
This commit is contained in:
Peter Simons 2008-06-28 15:22:31 +00:00
parent 6c58c97f3a
commit 8920511812
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/version-management/git/default.nix
View File

@ -11,11 +11,11 @@ assert svnSupport -> (subversion != null && perlLibs != []);
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "git-1.5.5"; name = "git-1.5.6.1";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
sha256 = "0pp6hfxkcwzb415wkkn713pqsv7cv06y90s53dyhsicqqn83hj17"; sha256 = "11k5d986y9clmb2lywkdv1g1gybz38irmcp4rx8l4jfmk7l62sh7";
}; };
patches = [ ./pwd.patch ./docbook2texi.patch ]; patches = [ ./pwd.patch ./docbook2texi.patch ];
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
ensureDir $out/share/emacs/site-lisp ensureDir $out/share/emacs/site-lisp
cp -p contrib/emacs/*.el $out/share/emacs/site-lisp cp -p contrib/emacs/*.el $out/share/emacs/site-lisp
'' # */ '' # */
+ (if svnSupport then + (if svnSupport then
''# wrap git-svn ''# wrap git-svn

18
pkgs/applications/version-management/git/pwd.patch
View File

@ -1,17 +1,7 @@
--- git-1.5.4.4/git-clone.sh 2008-03-09 11:18:13.000000000 +0100 diff -ubr git-1.5.6.1-orig/git-submodule.sh git-1.5.6.1/git-submodule.sh
+++ git-1.5.4.4/git-clone.sh 2008-03-30 23:43:35.000000000 +0200 --- git-1.5.6.1-orig/git-submodule.sh 2008-06-28 16:28:54.000000000 +0200
@@ -40,7 +40,7 @@ eval "$(echo "$OPTIONS_SPEC" | git rev-p +++ git-1.5.6.1/git-submodule.sh 2008-06-28 16:29:55.000000000 +0200
@@ -30,7 +30,7 @@
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()
# NEEDSWORK: identical function exists in get_repo_base in clone.sh # NEEDSWORK: identical function exists in get_repo_base in clone.sh
get_repo_base() { get_repo_base() {
( (