git: Update to 1.7.11.4
This commit is contained in:
parent
988ef8acea
commit
f901b6d38d
@ -9,10 +9,10 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
version = "1.7.11";
|
version = "1.7.11.4";
|
||||||
|
|
||||||
svn = subversionClient.override { perlBindings = true; };
|
svn = subversionClient.override { perlBindings = true; };
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
|
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
|
||||||
sha256 = "0qgi1cj19dnn0sl3n38dbz68nllvyppdvs2jb77ksiar4jb9lsc3";
|
sha256 = "16a1gm256w82j9ardzyfyqi0f35l3x92xsqz8ghz1pnja8jns7g9";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./docbook2texi.patch ];
|
patches = [ ./docbook2texi.patch ];
|
||||||
@ -100,7 +100,7 @@ stdenv.mkDerivation {
|
|||||||
for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; do
|
for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; do
|
||||||
sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \
|
sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \
|
||||||
-e "s|exec wish|exec '${tk}/bin/wish'|g" \
|
-e "s|exec wish|exec '${tk}/bin/wish'|g" \
|
||||||
"$out/$prog"
|
"$out/$prog"
|
||||||
done
|
done
|
||||||
'' else ''
|
'' else ''
|
||||||
# Don't wrap Tcl/Tk, replace them by notification scripts
|
# Don't wrap Tcl/Tk, replace them by notification scripts
|
||||||
|
Loading…
Reference in New Issue
Block a user