Merge branch 'master' into x-updates

Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix

1 files changed, 8 insertions, 22 deletions

diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix
index 325ab3b0a0f9..d564f2f561e8 100644
--- a/pkgs/applications/office/ledger/3.0.nix
+++ b/pkgs/applications/office/ledger/3.0.nix
@@ -1,36 +1,22 @@
-{ stdenv, fetchgit, python, autoconf, automake, libtool, gettext, emacs, gmp
-, pcre, expat, boost, mpfr, git, texinfo }:
+{ stdenv, fetchgit, cmake, boost, gmp, mpfr, libedit, python, texinfo }:
 
 let
-  rev = "d2915c66";
+  rev = "2c7ab8be";
 in
 stdenv.mkDerivation {
-  name = "ledger3-2012.01.${rev}";
+  name = "ledger3-2013.04.${rev}";
 
   src = fetchgit {
     url = "git://github.com/jwiegley/ledger.git";
     inherit rev;
-    sha256 = "a489c8b1c48889040d2cebaac1a0019e90acac0b51c9abf7914944dcb4b801e7";
+    sha256 = "1ng5ymzqzbgdrn2ghhr7jvcjv5y7ikhyck5p1yv5j024s17xdyj5";
   };
 
-  buildInputs = [
-    python autoconf automake libtool gettext emacs gmp pcre expat boost mpfr
-    git texinfo
-  ];
+  buildInputs = [ cmake boost gmp mpfr libedit python texinfo ];
 
-  CPPFLAGS = "-I${gmp}/include -I${mpfr}/include";
-
-  LDFLAGS = "-L${gmp}/lib -L${mpfr}/lib";
-
-  buildPhase = ''
-    sed -i acprep \
-      -e 's|search_prefixes = .*|search_prefixes = ["${boost}"]|' \
-      -e 's|/usr/bin/python|${python}/bin/python|'
-    export MAKEFLAGS="-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES"
-    python acprep update --no-pch --prefix=$out
-  '';
-
-  doCheck = !stdenv.isDarwin;
+  # Unit tests fail in the current git snapshot. Try enabling them again
+  # when updating this package!
+  doCheck = false;
 
   enableParallelBuilding = true;