From 06f80c77e28a04416846badef28d17d8dafc3193 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 1 Sep 2013 14:23:56 +0200 Subject: [PATCH 1/3] Update ledger3 to latest HEAD. Signed-off-by: Moritz Ulrich --- pkgs/applications/office/ledger/3.0.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix index b51fd6fe41e..a40a60650f4 100644 --- a/pkgs/applications/office/ledger/3.0.nix +++ b/pkgs/applications/office/ledger/3.0.nix @@ -1,23 +1,20 @@ { stdenv, fetchgit, cmake, boost, gmp, mpfr, libedit, python, texinfo }: let - rev = "26d7197"; + rev = "0ec4291013bae966df2f5ca504d2216e488cd7ec"; in stdenv.mkDerivation { - name = "ledger3-2013.06.${rev}"; + name = "ledger3-2013.08.${rev}"; src = fetchgit { url = "https://github.com/ledger/ledger.git"; inherit rev; - sha256 = "02nf4kdrd61q9rf5rrarwmx47y2ya5qix7n82cj9qi9p4v3k3m2g"; + sha256 = "1y4rcbx8y2fxkdc7i06n1i5jf3cq05bvzpb8498mis2gwfmkw470"; }; buildInputs = [ cmake boost gmp mpfr libedit python texinfo ]; - # Unit tests fail in the current git snapshot. Try enabling them again - # when updating this package! - doCheck = false; - + doCheck = true; enableParallelBuilding = true; meta = { From a7ba6d655dcc8c92f91e29e2ca345d602b780cda Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Wed, 4 Sep 2013 00:45:06 +0200 Subject: [PATCH 2/3] ledger3: Use short git rev. Signed-off-by: Moritz Ulrich --- pkgs/applications/office/ledger/3.0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix index a40a60650f4..b31cee7143b 100644 --- a/pkgs/applications/office/ledger/3.0.nix +++ b/pkgs/applications/office/ledger/3.0.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, boost, gmp, mpfr, libedit, python, texinfo }: let - rev = "0ec4291013bae966df2f5ca504d2216e488cd7ec"; + rev = "0ec4291"; in stdenv.mkDerivation { name = "ledger3-2013.08.${rev}"; From b77be3f3fe561ca2b102750ee44bf94c279f4434 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Wed, 4 Sep 2013 00:46:08 +0200 Subject: [PATCH 3/3] ledger3: Install emacs-lisp files manually. Build process is currently broken for emacs lisp files. Signed-off-by: Moritz Ulrich --- pkgs/applications/office/ledger/3.0.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix index b31cee7143b..6a49ede0857 100644 --- a/pkgs/applications/office/ledger/3.0.nix +++ b/pkgs/applications/office/ledger/3.0.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation { doCheck = true; enableParallelBuilding = true; + # Skip byte-compiling of emacs-lisp files because this is currently + # broken in ledger... + postInstall = '' + mkdir -p $out/share/emacs/site-lisp/ + cp -v $src/lisp/*.el $out/share/emacs/site-lisp/ + ''; + meta = { homepage = "http://ledger-cli.org/"; description = "A double-entry accounting system with a command-line reporting interface";