Update Git to 1.5.4.1.
svn path=/nixpkgs/trunk/; revision=10661
This commit is contained in:
parent
e1f2b15c70
commit
5ff8f11d54
@ -1,14 +1,14 @@
|
|||||||
args: with args;
|
args: with args;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "git-1.5.3.5";
|
name = "git-1.5.4.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
|
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}";
|
makeFlags="prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell}";
|
||||||
|
|
||||||
|
@ -4788,7 +4788,7 @@ rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
git = import ../applications/version-management/git {
|
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 {
|
gkrellm = import ../applications/misc/gkrellm {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user