diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2008-02-20 10:29:32 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2008-02-20 10:29:32 +0000 |
| commit | d494e7e709cb398e4764ef851152bd1d6f744848 (patch) | |
| tree | cc5a510331fc63598b5f1f5c65bbe13679578eeb | |
| parent | 777768d54413ec9347cdea49f2e146b8d845571f (diff) | |
Git 1.5.4.2 + Emacs mode.
svn path=/nixpkgs/trunk/; revision=10766
| -rw-r--r-- | pkgs/applications/version-management/git/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 18 insertions, 8 deletions
diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 2dfdb1f5019cf..9cd69bf900876 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -1,21 +1,31 @@ args: with args; stdenv.mkDerivation rec { - name = "git-1.5.4.1"; + name = "git-1.5.4.2"; src = fetchurl { url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; - sha256 = "17abc4de0cd46a15ecdd90dfb28edfbaafcd0f0ce7a081c1c4dfae9b2f5b217f"; + sha256 = "089n3da06k19gzhacsqgaamgx5hy5r50r2b4a626s87w44mj78sn"; }; - buildInputs = [curl openssl zlib expat gettext]; + buildInputs = [curl openssl zlib expat gettext emacs]; makeFlags="prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell}"; + postInstall = '' + # Install Emacs mode. + echo "installing Emacs mode..." + make install -C contrib/emacs prefix="$out" + + # XXX: There are other things under `contrib' that people might want to + # install. + ''; + meta = { - license = "GPL2"; - homepage = http://git.or.cz; - description = "A popular version control system designed to handle very - large projects with speed and efficiency"; + license = "GPLv2"; + homepage = http://git.or.cz; + description = ''Git, a popular distributed version control system + designed to handle very large projects with speed + and efficiency.''; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf820f3e5f981..174f2bcd47bca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4812,7 +4812,7 @@ rec { }; git = import ../applications/version-management/git { - inherit fetchurl stdenv curl openssl zlib expat perl gettext; + inherit fetchurl stdenv curl openssl zlib expat perl gettext emacs; }; gkrellm = import ../applications/misc/gkrellm { |