diff options
author | Peter Simons <simons@cryp.to> | 2013-04-21 20:37:53 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2013-04-21 20:37:53 +0200 |
commit | c9182f112a91bce84e5f6f5d4e1eb3a6e2bf4991 (patch) | |
tree | b222f8a7bba8a5e0b22a07f466e91990a870de2d | |
parent | 2340c84a00b28b1668143b617b0a674de538cf97 (diff) | |
download | nixlib-c9182f112a91bce84e5f6f5d4e1eb3a6e2bf4991.tar nixlib-c9182f112a91bce84e5f6f5d4e1eb3a6e2bf4991.tar.gz nixlib-c9182f112a91bce84e5f6f5d4e1eb3a6e2bf4991.tar.bz2 nixlib-c9182f112a91bce84e5f6f5d4e1eb3a6e2bf4991.tar.lz nixlib-c9182f112a91bce84e5f6f5d4e1eb3a6e2bf4991.tar.xz nixlib-c9182f112a91bce84e5f6f5d4e1eb3a6e2bf4991.tar.zst nixlib-c9182f112a91bce84e5f6f5d4e1eb3a6e2bf4991.zip |
ledger: update 3.x version to the latest Git snapshot
-rw-r--r-- | pkgs/applications/office/ledger/3.0.nix | 30 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 25 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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2548c10045b..e06c459392ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7427,9 +7427,7 @@ let links = callPackage ../applications/networking/browsers/links { }; ledger = callPackage ../applications/office/ledger/2.6.3.nix { }; - ledger3 = callPackage ../applications/office/ledger/3.0.nix { - boost = boost149; - }; + ledger3 = callPackage ../applications/office/ledger/3.0.nix { }; links2 = callPackage ../applications/networking/browsers/links2 { }; |