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

Git 1.6.0.

Browse Source 
svn path=/nixpkgs/trunk/; revision=12697
This commit is contained in:
Ludovic Courtès 2008-08-22 21:35:25 +00:00
parent 3328fd9d3d
commit 396ef44630
2 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,14 +10,14 @@ assert svnSupport -> (subversion != null && perlLibs != [] && subversion.perlBin
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "git-1.5.6.2"; name = "git-1.6.0";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; 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] buildInputs = [curl openssl zlib expat gettext cpio makeWrapper]
++ # documentation tools ++ # documentation tools
@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell}"; 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 = postInstall =
'' ''
notSupported(){ notSupported(){
@ -47,7 +51,7 @@ stdenv.mkDerivation rec {
for i in ${builtins.toString perlLibs}; do for i in ${builtins.toString perlLibs}; do
gitperllib=$gitperllib:$i/lib/site_perl gitperllib=$gitperllib:$i/lib/site_perl
done done
wrapProgram "$out/bin/git-svn" \ wrapProgram "$out/libexec/git-core/git-svn" \
--set GITPERLLIB "$gitperllib" \ --set GITPERLLIB "$gitperllib" \
--prefix PATH : "${subversion}/bin" '' --prefix PATH : "${subversion}/bin" ''
else '' # replace git-svn by notification script else '' # replace git-svn by notification script
@ -60,24 +64,21 @@ stdenv.mkDerivation rec {
+ (if guiSupport then '' + (if guiSupport then ''
# Wrap Tcl/Tk programs # Wrap Tcl/Tk programs
for prog in gitk git-gui git-citool for prog in bin/gitk libexec/git-core/git-gui
do do
wrapProgram "$out/bin/$prog" \ wrapProgram "$out/$prog" \
--set TK_LIBRARY "${tk}/lib/tk8.4" \ --set TK_LIBRARY "${tk}/lib/tk8.4" \
--prefix PATH : "${tk}/bin" --prefix PATH : "${tk}/bin"
done done
'' else '' '' else ''
# don not wrap Tcl/Tk, replace them by notification scripts # Don't wrap Tcl/Tk, replace them by notification scripts
for prog in gitk git-gui git-citool for prog in bin/gitk libexec/git-core/git-gui
do do
notSupported "$out/bin/$prog" "reinstall with config git = { guiSupport = true } set" notSupported "$out/$prog" \
"reinstall with config \`git = { guiSupport = true; }' set"
done done
'') '')
+ ''# Wrap `git-clone'
wrapProgram $out/bin/git-clone \
--prefix PATH : "${cpio}/bin" ''
+ ''# install bash completion script + ''# install bash completion script
d="$out/etc/bash_completion.d" d="$out/etc/bash_completion.d"
ensureDir $d; cp contrib/completion/git-completion.bash "$d" ensureDir $d; cp contrib/completion/git-completion.bash "$d"

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

@ -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