diff options
author | Ludovic Courtès <ludo@gnu.org> | 2008-08-22 21:35:25 +0000 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2008-08-22 21:35:25 +0000 |
commit | 396ef446308420ee17305e7b3fc1eb05482a3754 (patch) | |
tree | dec3b2c5324609fa3e01107d0d829be7cb3c5ef4 /pkgs/applications/version-management/git | |
parent | 3328fd9d3d372b6338c92c7ed1349f7f7d46f96e (diff) |
Git 1.6.0.
svn path=/nixpkgs/trunk/; revision=12697
Diffstat (limited to 'pkgs/applications/version-management/git')
-rw-r--r-- | pkgs/applications/version-management/git/default.nix | 27 | ||||
-rw-r--r-- | pkgs/applications/version-management/git/pwd.patch | 12 |
2 files changed, 14 insertions, 25 deletions
diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index c0d6b514a0c13..e50807defd9bb 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -10,14 +10,14 @@ assert svnSupport -> (subversion != null && perlLibs != [] && subversion.perlBin stdenv.mkDerivation rec { - name = "git-1.5.6.2"; + name = "git-1.6.0"; src = fetchurl { url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; - sha256 = "0bq4rwa9kfn5z1daszb1qvqjzy1hk3ir392bpikhmsqp9hi5yc0j"; + sha256 = "1w22f5vnmw6r0k67ssrjca2n9jj2bimgvca9v7jz8nf0h381rmxq"; }; - patches = [ ./pwd.patch ./docbook2texi.patch ]; + patches = [ ./docbook2texi.patch ]; buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] ++ # documentation tools @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell}"; + # FIXME: "make check" requires Sparse; the Makefile must be tweaked + # so that `SPARSE_FLAGS' corresponds to the current architecture... + #doCheck = true; + postInstall = '' notSupported(){ @@ -47,7 +51,7 @@ stdenv.mkDerivation rec { for i in ${builtins.toString perlLibs}; do gitperllib=$gitperllib:$i/lib/site_perl done - wrapProgram "$out/bin/git-svn" \ + wrapProgram "$out/libexec/git-core/git-svn" \ --set GITPERLLIB "$gitperllib" \ --prefix PATH : "${subversion}/bin" '' else '' # replace git-svn by notification script @@ -60,24 +64,21 @@ stdenv.mkDerivation rec { + (if guiSupport then '' # Wrap Tcl/Tk programs - for prog in gitk git-gui git-citool + for prog in bin/gitk libexec/git-core/git-gui do - wrapProgram "$out/bin/$prog" \ + wrapProgram "$out/$prog" \ --set TK_LIBRARY "${tk}/lib/tk8.4" \ --prefix PATH : "${tk}/bin" done '' else '' - # don not wrap Tcl/Tk, replace them by notification scripts - for prog in gitk git-gui git-citool + # Don't wrap Tcl/Tk, replace them by notification scripts + for prog in bin/gitk libexec/git-core/git-gui do - notSupported "$out/bin/$prog" "reinstall with config git = { guiSupport = true } set" + notSupported "$out/$prog" \ + "reinstall with config \`git = { guiSupport = true; }' set" done '') - + ''# Wrap `git-clone' - wrapProgram $out/bin/git-clone \ - --prefix PATH : "${cpio}/bin" '' - + ''# install bash completion script d="$out/etc/bash_completion.d" ensureDir $d; cp contrib/completion/git-completion.bash "$d" diff --git a/pkgs/applications/version-management/git/pwd.patch b/pkgs/applications/version-management/git/pwd.patch deleted file mode 100644 index 57ba4d140a660..0000000000000 --- a/pkgs/applications/version-management/git/pwd.patch +++ /dev/null @@ -1,12 +0,0 @@ -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() { - ( -- cd "`/bin/pwd`" && -+ cd "`pwd`" && - cd "$1" || cd "$1.git" && - { - cd .git |