diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:12:15 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:12:15 +0100 |
commit | 18af6870370226b4d502d7372844e7f2aded5887 (patch) | |
tree | 749d93209bd0cb9710ccaae2207df670f37eaa36 /gnu/packages/finance.scm | |
parent | 0ab8ad46322bea331ed5f5592843ba35e7f38b37 (diff) | |
parent | 3089b70d766bd9ec70e1464867130b7b864fbe17 (diff) | |
download | guix-patches-18af6870370226b4d502d7372844e7f2aded5887.tar guix-patches-18af6870370226b4d502d7372844e7f2aded5887.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/icu4c.scm
gnu/packages/man.scm
gnu/packages/python-xyz.scm
guix/scripts/environment.scm
guix/scripts/pack.scm
guix/scripts/package.scm
guix/scripts/pull.scm
guix/store.scm
Diffstat (limited to 'gnu/packages/finance.scm')
-rw-r--r-- | gnu/packages/finance.scm | 57 |
1 files changed, 43 insertions, 14 deletions
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 0e44802fe1..43eda97f1a 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -451,9 +451,8 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (define-public electron-cash (package - (inherit electrum) (name "electron-cash") - (version "4.0.12") + (version "4.0.14") (source (origin (method git-fetch) @@ -462,22 +461,52 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "0gidrx8499v7rig7ljhd70wssshs1qm0gp1553g70i323hcbf62x")))) + (base32 "1dp7cj1185h6xfz6jzh0iq58zvg3wq9hl96bkgxkf5h4ygni2vm6")))) + (build-system python-build-system) (inputs - `(,@(package-inputs electrum) + `(("libevent" ,libevent) ("libsecp256k1", libsecp256k1) + ("openssl" ,openssl) + ("python-cython" ,python-cython) ("python-dateutil", python-dateutil) - ("python-dnspython", python-dnspython))) + ("python-dnspython" ,python-dnspython) + ("python-ecdsa" ,python-ecdsa) + ("python-hidapi" ,python-hidapi) + ("python-jsonrpclib-pelix" ,python-jsonrpclib-pelix) + ("python-keepkey" ,python-keepkey) + ("python-protobuf" ,python-protobuf) + ("python-pyaes" ,python-pyaes) + ("python-pyqt" ,python-pyqt) + ("python-pysocks" ,python-pysocks) + ("python-qrcode" ,python-qrcode) + ("python-requests" ,python-requests) + ("python-stem" ,python-stem) + ("python-trezor" ,python-trezor) + ("qtsvg" ,qtsvg) + ("zlib" ,zlib))) (arguments - (substitute-keyword-arguments (package-arguments electrum) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'use-libsecp256k1-input - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "lib/secp256k1.py" - (("library_paths = .* 'libsecp256k1.so.0'.") - (string-append "library_paths = ('" (assoc-ref inputs "libsecp256k1") "/lib/libsecp256k1.so.0'"))))))))) + `(#:tests? #f ; No tests + #:modules ((guix build python-build-system) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%python-build-system-modules + (guix build qt-utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-home + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "setup.py" + (("~/.local/share") + (string-append (assoc-ref outputs "out") "/local/share"))))) + (add-after 'unpack 'use-libsecp256k1-input + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "lib/secp256k1.py" + (("library_paths = .* 'libsecp256k1.so.0'.") + (string-append "library_paths = ('" (assoc-ref inputs "libsecp256k1") "/lib/libsecp256k1.so.0'"))))) + (add-after 'install 'wrap-qt + (lambda* (#:key outputs #:allow-other-keys) + (wrap-qt-program (assoc-ref outputs "out") "electron-cash") + #t))))) (home-page "https://electroncash.org/") (synopsis "Bitcoin Cash wallet") (description |