From a2de9c334a5901f57ae41aa134d9fbd83b802fb8 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 31 Aug 2017 11:51:10 +0800 Subject: [PATCH] ledger: fixed with older boost --- pkgs/applications/office/ledger/default.nix | 32 ++++++++++----------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index a761b9fd5b9..2d66fe4b309 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -1,22 +1,21 @@ -{ stdenv, fetchgit, cmake, boost, gmp, mpfr, libedit, python +{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python , texinfo, gnused }: -let - version = "3.1.1"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ledger-${version}"; + version = "3.1.1"; - # NOTE: fetchgit because ledger has submodules not included in the - # default github tarball. - src = fetchgit { - url = "https://github.com/ledger/ledger.git"; - rev = "refs/tags/v${version}"; + src = fetchFromGitHub { + owner = "ledger"; + repo = "ledger"; + rev = "v${version}"; sha256 = "1j4p7djkmdmd858hylrsc3inamh9z0vkfl98s9wiqfmrzw51pmxp"; + fetchSubmodules = true; }; - buildInputs = [ cmake boost gmp mpfr libedit python texinfo gnused ]; + buildInputs = [ boost gmp mpfr libedit python texinfo gnused ]; + + nativeBuildInputs = [ cmake ]; enableParallelBuilding = true; @@ -29,10 +28,10 @@ stdenv.mkDerivation { cp -v "$src/lisp/"*.el $out/share/emacs/site-lisp/ ''; - meta = { + meta = with stdenv.lib; { homepage = http://ledger-cli.org/; description = "A double-entry accounting system with a command-line reporting interface"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; longDescription = '' Ledger is a powerful, double-entry accounting system that is accessed @@ -41,8 +40,7 @@ stdenv.mkDerivation { their data, there really is no alternative. ''; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ the-kenny jwiegley ]; - broken = true; + platforms = platforms.all; + maintainers = with maintainers; [ the-kenny jwiegley ]; }; }