From 5ff8f11d54db7c31d1cc7f93cd24a8f7cc296d23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 13 Feb 2008 16:50:59 +0000
Subject: [PATCH] Update Git to 1.5.4.1.
svn path=/nixpkgs/trunk/; revision=10661
---
pkgs/applications/version-management/git/default.nix | 6 +++---
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index c2388f8c1aa..2dfdb1f5019 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -1,14 +1,14 @@
args: with args;
stdenv.mkDerivation rec {
- name = "git-1.5.3.5";
+ name = "git-1.5.4.1";
src = fetchurl {
url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
- sha256 = "0ab63s25wzmsl5inp7bykz5ac7xjilqa0ciaz7ydhciymz6gkawj";
+ sha256 = "17abc4de0cd46a15ecdd90dfb28edfbaafcd0f0ce7a081c1c4dfae9b2f5b217f";
};
- buildInputs = [curl openssl zlib expat];
+ buildInputs = [curl openssl zlib expat gettext];
makeFlags="prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43a684b2f23..e56f99882ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4788,7 +4788,7 @@ rec {
};
git = import ../applications/version-management/git {
- inherit fetchurl stdenv curl openssl zlib expat perl;
+ inherit fetchurl stdenv curl openssl zlib expat perl gettext;
};
gkrellm = import ../applications/misc/gkrellm {