diff options
author | Marius Bakke <marius@gnu.org> | 2020-05-29 23:36:38 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-05-29 23:36:38 +0200 |
commit | fe6d003908fd8278de65761bc550240c520ef9f4 (patch) | |
tree | abe88c7905a8907ddafc554fbeef5b0af08f835d /gnu/packages/finance.scm | |
parent | 8a7a5dc7805f4628e60f90af6b2416f951d0c034 (diff) | |
parent | 031315e4f0fbc4e04ffc8adee04128c23173a1f7 (diff) | |
download | guix-patches-fe6d003908fd8278de65761bc550240c520ef9f4.tar guix-patches-fe6d003908fd8278de65761bc550240c520ef9f4.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/finance.scm')
-rw-r--r-- | gnu/packages/finance.scm | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 92a00240f3..f182057bb4 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -547,7 +547,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch ;; the system's dynamically linked library. (package (name "monero") - (version "0.15.0.5") + (version "0.16.0.0") (source (origin (method git-fetch) @@ -568,7 +568,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch #t)) (sha256 (base32 - "06zzwa0y8ic6x3y2fy501788r51p4klanyvmm76ywrwf087njlkv")))) + "0x74h5z0nxxxip97ibc854pqmrgd8r4d6w62m424f66i8gbzfskh")))) (build-system cmake-build-system) (native-inputs `(("doxygen" ,doxygen) @@ -666,7 +666,7 @@ the Monero command line client and daemon.") (define-public monero-gui (package (name "monero-gui") - (version "0.15.0.4") + (version "0.16.0.0") (source (origin (method git-fetch) @@ -676,14 +676,16 @@ the Monero command line client and daemon.") (file-name (git-file-name name version)) (sha256 (base32 - "12m5fgnxkr11q2arx1m5ccpxqm5ljcvm6l547dwqn297zs5jim4z")))) + "06vdrsj5y9k0zn32hspyxc7sw1kkyrvi3chzkdbnxk9jvyj8k4ld")))) (build-system qt-build-system) (native-inputs - `(("pkg-config" ,pkg-config) + `(("monero-source" ,(package-source monero)) + ("pkg-config" ,pkg-config) ("qttools" ,qttools))) (inputs `(("boost" ,boost) ("hidapi" ,hidapi) + ("libgcrypt" ,libgcrypt) ("libsodium" ,libsodium) ("libunwind" ,libunwind) ("libusb" ,libusb) @@ -705,7 +707,16 @@ the Monero command line client and daemon.") `(#:tests? #f ; No tests #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-makefile-vars + (add-after 'unpack 'get-monero-extra-files + ;; Some headers and GnuPG public keys of the monero package source + ;; code are required to build the GUI. + (lambda* (#:key inputs #:allow-other-keys) + (invoke "tar" "-xv" "--wildcards" "--strip-components=1" + "-C" "monero" + "-f" (assoc-ref inputs "monero-source") + "*.asc" "*.h") + #t)) + (add-after 'get-monero-extra-files 'fix-makefile-vars (lambda _ (substitute* "src/zxcvbn-c/makefile" (("\\?=") "=")) @@ -1510,14 +1521,14 @@ like Flowee the Hub, which Fulcrum connects to over RPC.") (define-public flowee (package (name "flowee") - (version "2020.03.3") + (version "2020.04.1") (source (origin (method url-fetch) (uri (string-append "https://gitlab.com/FloweeTheHub/thehub/-/archive/" version "/thehub-" version ".tar.gz")) (sha256 - (base32 "0ksyh7ll3v9p8f5y15vcb2vkrpzb4h0ricag9j90ad4b4rfsnpjw")))) + (base32 "1vwvaxm3b71pfx8l4rrv06wqks6xdf2333w856b36s1bzvj53rhc")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-Dbuild_tests=ON" "-Denable_gui=OFF") |