public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgs/applications/editors/emacs-modes/magit: updated to version magit-0.7-94-gbf42bf8 

Magit has seen plenty of development since version 0.7, but for some reason
there haven't been any new releases. This version bump updates the expression to
build a current version of Magit directly from the Git repository.

This change adds buildInputs 'autoconf' and 'automake'. These tools are required
only because we aren't building from a proper release tarball. Once version 0.8
comes out, these dependencies can be dropped again.

svn path=/nixpkgs/trunk/; revision=20650
This commit is contained in:
Peter Simons 2010-03-16 12:13:40 +00:00
parent f92867651f
commit b6d6f301c4
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/editors/emacs-modes/magit/default.nix
View File

@ -1,14 +1,16 @@
{stdenv, fetchurl, emacs, texinfo}: {stdenv, fetchurl, emacs, texinfo, autoconf, automake}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "magit-0.7"; name = "magit-0.7-94-gbf42bf8";
src = fetchurl { src = fetchurl {
url = "http://zagadka.vm.bytemark.co.uk/magit/magit-0.7.tar.gz"; url = "http://gitorious.org/magit/mainline/archive-tarball/magit_0.7-94-gbf42bf8";
sha256 = "0qry1vj41pycwkf71sqrz3zgzh85zdg5acq26asscq4s7jksrjiz"; sha256 = "6543a4e312d1a4249ff1edd192914d02f1a9016c321c8fdd0f015074e522759a";
}; };
unpackCmd = "tar xf $src";
preConfigure = "./autogen.sh";
buildInputs = [emacs texinfo]; buildInputs = [emacs texinfo autoconf automake];
meta = { meta = {
description = "An an interface to Git, implemented as an extension to Emacs."; description = "An an interface to Git, implemented as an extension to Emacs.";

24
pkgs/top-level/all-packages.nix
View File

@ -3808,14 +3808,14 @@ let
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
gmp = gmp =
if stdenv.system == "i686-darwin" then if stdenv.system == "i686-darwin" then
# GMP 4.3.2 is broken on Darwin, so use 4.3.1. # GMP 4.3.2 is broken on Darwin, so use 4.3.1.
makeOverridable (import ../development/libraries/gmp/4.3.1.nix) { makeOverridable (import ../development/libraries/gmp/4.3.1.nix) {
inherit stdenv fetchurl m4; inherit stdenv fetchurl m4;
cxx = false; cxx = false;
} }
else else
makeOverridable (import ../development/libraries/gmp) { makeOverridable (import ../development/libraries/gmp) {
inherit stdenv fetchurl m4; inherit stdenv fetchurl m4;
cxx = false; cxx = false;
@ -4450,7 +4450,7 @@ let
inherit fetchurl stdenv pkgconfig; inherit fetchurl stdenv pkgconfig;
inherit (xlibs) libX11 libxcb xcbutil; inherit (xlibs) libX11 libxcb xcbutil;
}; };
libtasn1 = import ../development/libraries/libtasn1 { libtasn1 = import ../development/libraries/libtasn1 {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
@ -4883,17 +4883,17 @@ let
librdf_raptor = import ../development/libraries/librdf/raptor.nix { librdf_raptor = import ../development/libraries/librdf/raptor.nix {
inherit fetchurl stdenv lib libxml2 curl; inherit fetchurl stdenv lib libxml2 curl;
}; };
librdf_rasqal = import ../development/libraries/librdf/rasqal.nix { librdf_rasqal = import ../development/libraries/librdf/rasqal.nix {
inherit fetchurl stdenv lib pcre libxml2 gmp librdf_raptor; inherit fetchurl stdenv lib pcre libxml2 gmp librdf_raptor;
}; };
librdf = import ../development/libraries/librdf { librdf = import ../development/libraries/librdf {
inherit fetchurl stdenv lib pkgconfig librdf_raptor ladspaH openssl zlib; inherit fetchurl stdenv lib pkgconfig librdf_raptor ladspaH openssl zlib;
}; };
redland = redland_1_0_10; redland = redland_1_0_10;
redland_1_0_8 = makeOverridable (import ../development/libraries/redland/1.0.8.nix) { redland_1_0_8 = makeOverridable (import ../development/libraries/redland/1.0.8.nix) {
inherit fetchurl stdenv openssl libxml2 pkgconfig perl sqlite inherit fetchurl stdenv openssl libxml2 pkgconfig perl sqlite
libxslt curl pcre librdf_rasqal librdf_raptor; libxslt curl pcre librdf_rasqal librdf_raptor;
@ -6616,7 +6616,7 @@ let
inherit fetchurl stdenv pkgconfig gettext inherit fetchurl stdenv pkgconfig gettext
intltool perl perlXMLParser libxml2 glib; intltool perl perlXMLParser libxml2 glib;
}; };
shared_desktop_ontologies = import ../data/misc/shared-desktop-ontologies { shared_desktop_ontologies = import ../data/misc/shared-desktop-ontologies {
inherit stdenv fetchurl cmake; inherit stdenv fetchurl cmake;
}; };
@ -7050,7 +7050,7 @@ let
dmtx = builderDefsPackage (import ../tools/graphics/dmtx) { dmtx = builderDefsPackage (import ../tools/graphics/dmtx) {
inherit libpng libtiff libjpeg imagemagick librsvg inherit libpng libtiff libjpeg imagemagick librsvg
pkgconfig bzip2 zlib libtool freetype fontconfig pkgconfig bzip2 zlib libtool freetype fontconfig
ghostscript; ghostscript;
inherit (xlibs) libX11; inherit (xlibs) libX11;
}; };
@ -7174,7 +7174,7 @@ let
}; };
magit = import ../applications/editors/emacs-modes/magit { magit = import ../applications/editors/emacs-modes/magit {
inherit fetchurl stdenv emacs texinfo; inherit fetchurl stdenv emacs texinfo autoconf automake;
}; };
maudeMode = import ../applications/editors/emacs-modes/maude { maudeMode = import ../applications/editors/emacs-modes/maude {
@ -8753,13 +8753,13 @@ let
}; };
kde4 = kde43; kde4 = kde43;
kde43 = makeOverridable (import ../desktops/kde-4.3) (pkgs // { kde43 = makeOverridable (import ../desktops/kde-4.3) (pkgs // {
openexr = openexr_1_6_1; openexr = openexr_1_6_1;
qt4 = qt45; qt4 = qt45;
popplerQt4 = popplerQt45; popplerQt4 = popplerQt45;
}); });
kde44 = makeOverridable (import ../desktops/kde-4.4) (pkgs // { kde44 = makeOverridable (import ../desktops/kde-4.4) (pkgs // {
openexr = openexr_1_6_1; openexr = openexr_1_6_1;
qt4 = qt46; qt4 = qt46;
@ -8767,7 +8767,7 @@ let
sip = sip410; sip = sip410;
pyqt4 = pyqt47; pyqt4 = pyqt47;
}); });
kdelibs = kde3.kdelibs; kdelibs = kde3.kdelibs;
kdebase = kde3.kdebase; kdebase = kde3.kdebase;