diff options
| author | Peter Simons <simons@cryp.to> | 2010-05-12 09:09:55 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2010-05-12 09:09:55 +0000 |
| commit | 55a322022ce5d322eb41ab3d2f0be9a82c0bbaf4 (patch) | |
| tree | 099169839f2f062f7b611d1bf6dff75bfbd8139c | |
| parent | 657ae2a6213b3407f3866a2507ebc82e0646dfa0 (diff) | |
| download | nixlib-55a322022ce5d322eb41ab3d2f0be9a82c0bbaf4.tar nixlib-55a322022ce5d322eb41ab3d2f0be9a82c0bbaf4.tar.gz nixlib-55a322022ce5d322eb41ab3d2f0be9a82c0bbaf4.tar.bz2 nixlib-55a322022ce5d322eb41ab3d2f0be9a82c0bbaf4.tar.lz nixlib-55a322022ce5d322eb41ab3d2f0be9a82c0bbaf4.tar.xz nixlib-55a322022ce5d322eb41ab3d2f0be9a82c0bbaf4.tar.zst nixlib-55a322022ce5d322eb41ab3d2f0be9a82c0bbaf4.zip | |
pkgs/applications/editors/emacs-modes/magit: bumped to 0.8 release
svn path=/nixpkgs/trunk/; revision=21737
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/magit/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 10 insertions, 12 deletions
diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index 1a783fdbd8aa..45de918a472d 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -1,20 +1,17 @@ -{ stdenv, fetchgit, emacs, texinfo, autoconf, automake }: +{ stdenv, fetchurl, emacs, texinfo }: let - version = "0.7-180-gcb458d5"; + version = "0.8"; in stdenv.mkDerivation { name = "magit-${version}"; - src = fetchgit { - url = "http://git.gitorious.org/magit/mainline.git"; - rev = "cb458d59182a4497b3435090ae71357b6b8c385d"; - sha256 = "1vbafn0drkzhrr6yrgvf62aa9bnk785vavdgsmngjfxql1ngaq2x"; + src = fetchurl { + url = "http://github.com/downloads/philjackson/magit/magit-${version}.tar.gz"; + sha256 = "4d1b55dcb118e506c6b8838acd4a50dbdd5348b1d12edd9789a3109a582e2954"; }; - unpackCmd = "tar xf $src"; - preConfigure = "./autogen.sh"; - buildInputs = [emacs texinfo autoconf automake]; + buildInputs = [emacs texinfo]; meta = { description = "An an interface to Git, implemented as an extension to Emacs."; @@ -32,6 +29,8 @@ stdenv.mkDerivation { ''; license = "GPLv3+"; - homepage = "http://zagadka.vm.bytemark.co.uk/magit/"; + homepage = "http://github.com/philjackson/magit"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 277e3aa0b9a2..a5e61be80b98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7492,8 +7492,7 @@ let }; magit = import ../applications/editors/emacs-modes/magit { - inherit fetchgit stdenv emacs texinfo autoconf; - automake = automake111x; + inherit fetchurl stdenv emacs texinfo; }; maudeMode = import ../applications/editors/emacs-modes/maude { |