git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #94496 from jonringer/bump-ledger

ledger: 3.1.3 -> 3.2.1

commite4143bc504e9026e9f8661aef97ad2d8b092861b authorJohn Wiegley <johnw@newartisans.com> dateWed 5 Aug 2020, 09:17 (6 years ago) parent31dde67c9c8acf
2 files changed+18−16
pkgs/applications/office/ledger/default.nix+17−10 pkgs/top-level/all-packages.nix+1−6
pkgs/applications/office/ledger/default.nix+17−10
@@ -1,37 +1,44 @@
1−{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python
1+{ stdenv, lib, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python
22, texinfo, gnused, usePython ? true }:
33
44stdenv.mkDerivation rec {
55 pname = "ledger";
6− version = "3.1.3";
6+ version = "3.2.1";
77
88 src = fetchFromGitHub {
99 owner = "ledger";
1010 repo = "ledger";
1111 rev = "v${version}";
12− sha256 = "0bfnrqrd6wqgsngfpqi30xh6yy86pwl25iwzrqy44q31r0zl4mm3";
12+ sha256 = "0x6jxwss3wwzbzlwmnwb8yzjk8f9wfawif4f1b74z2qg6hc4r7f6";
1313 };
1414
15+ outputs = [ "out" "dev" ];
16+
1517 buildInputs = [
1618 (boost.override { enablePython = usePython; })
17− gmp mpfr libedit python texinfo gnused
19+ gmp mpfr libedit python gnused
1820 ];
1921
20− nativeBuildInputs = [ cmake ];
22+ nativeBuildInputs = [ cmake texinfo ];
2123
2224 enableParallelBuilding = true;
2325
2426 cmakeFlags = [
2527 "-DCMAKE_INSTALL_LIBDIR=lib"
2628 "-DBUILD_DOCS:BOOL=ON"
27− (stdenv.lib.optionalString usePython "-DUSE_PYTHON=true")
28− ];
29+ (lib.optionalString usePython "-DUSE_PYTHON=true")
30+ ];
2931
30− postBuild = ''
31− make doc
32+ # by default, it will query the python interpreter for it's sitepackages location
33+ # however, that would write to a different nixstore path, pass our own sitePackages location
34+ prePatch = lib.optionalString usePython ''
35+ substituteInPlace src/CMakeLists.txt \
36+ --replace 'DESTINATION ''${Python_SITEARCH}' 'DESTINATION "${python.sitePackages}"'
3237 '';
3338
34− meta = with stdenv.lib; {
39+ installTargets = [ "doc" "install" ];
40+
41+ meta = with lib; {
3542 homepage = "https://ledger-cli.org/";
3643 description = "A double-entry accounting system with a command-line reporting interface";
3744 license = licenses.bsd3;
pkgs/top-level/all-packages.nix+1−6
@@ -21106,12 +21106,7 @@ in
2110621106
2110721107 linuxband = callPackage ../applications/audio/linuxband { };
2110821108
21109− ledger = callPackage ../applications/office/ledger {
21110− # Boost >= 1.67 changed the name of boost python; ledger's cmake build needs
21111− # an update to find it:
21112− # https://www.boost.org/doc/libs/1_68_0/libs/python/doc/html/rn.html
21113− boost = boost15x;
21114− };
21109+ ledger = callPackage ../applications/office/ledger { };
2111521110
2111621111 ledger-autosync = callPackage ../applications/office/ledger-autosync { };
2111721112