diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-06 15:26:24 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-06 15:27:28 -0400 |
| commit | f901b6d38d61b7a99a7d1ea633294a6f9a6ae78e (patch) | |
| tree | 3ed28175493193cf1f6600ad5391e286c07205ff /pkgs/applications/version-management/git-and-tools/git/default.nix | |
| parent | 988ef8acea8daa7c9b473a21e73f9c26d324c506 (diff) | |
| download | nixpkgs-f901b6d38d61b7a99a7d1ea633294a6f9a6ae78e.tar nixpkgs-f901b6d38d61b7a99a7d1ea633294a6f9a6ae78e.tar.gz nixpkgs-f901b6d38d61b7a99a7d1ea633294a6f9a6ae78e.tar.bz2 nixpkgs-f901b6d38d61b7a99a7d1ea633294a6f9a6ae78e.tar.lz nixpkgs-f901b6d38d61b7a99a7d1ea633294a6f9a6ae78e.tar.xz nixpkgs-f901b6d38d61b7a99a7d1ea633294a6f9a6ae78e.tar.zst nixpkgs-f901b6d38d61b7a99a7d1ea633294a6f9a6ae78e.zip | |
git: Update to 1.7.11.4
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools/git/default.nix')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 4ed5f78d6e0..066b5a50913 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,10 +9,10 @@ let - version = "1.7.11"; - + version = "1.7.11.4"; + svn = subversionClient.override { perlBindings = true; }; - + in stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "0qgi1cj19dnn0sl3n38dbz68nllvyppdvs2jb77ksiar4jb9lsc3"; + sha256 = "16a1gm256w82j9ardzyfyqi0f35l3x92xsqz8ghz1pnja8jns7g9"; }; 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 sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \ -e "s|exec wish|exec '${tk}/bin/wish'|g" \ - "$out/$prog" + "$out/$prog" done '' else '' # Don't wrap Tcl/Tk, replace them by notification scripts |