From f19a35aeebcc8aa7ed1dc6d64666b357989235af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 11 May 2010 14:56:28 +0000 Subject: [PATCH] Magit: Latest version. The tarball at crypt.to had vanished, and hopefully `fetchgit' over HTTP will work for everyone. svn path=/nixpkgs/trunk/; revision=21722 --- .../editors/emacs-modes/magit/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index 4f0b760ae20..1a783fdbd8a 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -1,14 +1,15 @@ -{stdenv, fetchurl, emacs, texinfo, autoconf, automake}: +{ stdenv, fetchgit, emacs, texinfo, autoconf, automake }: let - version = "0.7-109-g0fc3980"; + version = "0.7-180-gcb458d5"; in stdenv.mkDerivation { name = "magit-${version}"; - src = fetchurl { - url = "http://cryp.to/magit-mainline-${version}.tar.gz"; - sha256 = "0jyx57znvn49xm0h92kh8iywn44ip130dpflzq2ns2k6gspg36b6"; + src = fetchgit { + url = "http://git.gitorious.org/magit/mainline.git"; + rev = "cb458d59182a4497b3435090ae71357b6b8c385d"; + sha256 = "1vbafn0drkzhrr6yrgvf62aa9bnk785vavdgsmngjfxql1ngaq2x"; }; unpackCmd = "tar xf $src"; preConfigure = "./autogen.sh"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f2e93067b6..6b824a7ed4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7484,7 +7484,8 @@ let }; magit = import ../applications/editors/emacs-modes/magit { - inherit fetchurl stdenv emacs texinfo autoconf automake; + inherit fetchgit stdenv emacs texinfo autoconf; + automake = automake111x; }; maudeMode = import ../applications/editors/emacs-modes/maude {