diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
| commit | 6f9a80b331ae41d142a49fbeb94b90ee587b6155 (patch) | |
| tree | 2da042a6ccf5368c73d6e3d54c2ee02a62d284e4 /gnu/packages/finance.scm | |
| parent | 6500c9a5b364616e38a7e03aa4516fc2d7cee876 (diff) | |
| parent | dece03e2b98fc1c2428c2448ce5792f813eb79bf (diff) | |
Merge branch 'master' into core-updates
Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a2770ef4d05a6e18f40d602e51da749ddc and
12964df69a99de6190422c752fef65ef813f3b6b respectively.
4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.
Conflicts:
gnu/local.mk
gnu/packages/aidc.scm
gnu/packages/boost.scm
gnu/packages/curl.scm
gnu/packages/nettle.scm
gnu/packages/networking.scm
gnu/packages/python-xyz.scm
gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/finance.scm')
| -rw-r--r-- | gnu/packages/finance.scm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index fbd7df783c6..d4c571d3ec1 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2020 Christopher Lemmer Webber <cwebber@dustycloud.org> ;;; Copyright © 2020 Tom Zander <tomz@freedommail.ch> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> -;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> +;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020 Carlo Holl <carloholl@gmail.com> ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2021 ZmnSCPxj jxPCSnmZ <ZmnSCPxj@protonmail.com> @@ -138,7 +138,7 @@ ("libevent" ,libevent) ("miniupnpc" ,miniupnpc) ("openssl" ,openssl) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:configure-flags (list @@ -268,14 +268,14 @@ Accounting.") (define-public homebank (package (name "homebank") - (version "5.4.3") + (version "5.5.2") (source (origin (method url-fetch) (uri (string-append "http://homebank.free.fr/public/homebank-" version ".tar.gz")) (sha256 (base32 - "02wd569viwy6ncy0144z9nxr3zmpl4shkqhz7zzwyky4gknxf8lj")))) + "1lhyql94zx51vcw9hlc9r26wkm2bn6jdd4xvc95j7y69wiwg77lq")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -773,7 +773,7 @@ the Monero command line client and daemon.") `(,@(package-inputs monero) ("libgcrypt" ,libgcrypt) ("monero" ,monero) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) @@ -1309,7 +1309,7 @@ Trezor wallet.") ("openssl" ,openssl) ("protobuf" ,protobuf) ("qrencode" ,qrencode) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("zeromq" ,zeromq) ("zlib" ,zlib))) (arguments @@ -1422,7 +1422,7 @@ following three utilities are included with the library: ("openssl" ,openssl) ("protobuf" ,protobuf) ("qrencode" ,qrencode) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("zeromq" ,zeromq) ("zlib" ,zlib))) (arguments @@ -1496,7 +1496,7 @@ a Qt GUI.") `(("qttools" ,qttools))) (inputs `(("python" ,python) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("rocksdb" ,rocksdb) ("zlib" ,zlib))) (home-page "https://gitlab.com/FloweeTheHub/fulcrum/") @@ -1561,7 +1561,7 @@ like Flowee the Hub, which Fulcrum connects to over RPC.") ("libevent" ,libevent) ("miniupnpc" ,miniupnpc) ("openssl" ,openssl) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools) |