Merge pull request #118363 from prusnak/electrum

electrum: 4.0.9 -> 4.1.1
This commit is contained in:
Pavol Rusnak 2021-04-03 11:36:22 +02:00 committed by GitHub
commit c54625d5ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 11 deletions

View File

@ -1,4 +1,5 @@
{ lib, stdenv { lib
, stdenv
, fetchurl , fetchurl
, fetchFromGitHub , fetchFromGitHub
, wrapQtAppsHook , wrapQtAppsHook
@ -19,7 +20,7 @@
}: }:
let let
version = "4.0.9"; version = "4.1.1";
libsecp256k1_name = libsecp256k1_name =
if stdenv.isLinux then "libsecp256k1.so.0" if stdenv.isLinux then "libsecp256k1.so.0"
@ -35,7 +36,7 @@ let
owner = "spesmilo"; owner = "spesmilo";
repo = "electrum"; repo = "electrum";
rev = version; rev = version;
sha256 = "0cmdyfabllw4wnpqpdxp3l6hjnm0cvkwxn0z8ph4x54sf4zq9iz3"; sha256 = "0zvv8nmjzw5pchykz5p28483nby4lp4ah7iqr08pv36gy89l51v5";
extraPostFetch = '' extraPostFetch = ''
mv $out ./all mv $out ./all
@ -50,7 +51,7 @@ python3.pkgs.buildPythonApplication {
src = fetchurl { src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
sha256 = "1fvjiagi78f32nxgr2rx8jas8hxfvpp1c8fpfcalvykmlhdc2gva"; sha256 = "0yg6ld92a4xgn7y8i51hmr3kmgmrbrjwniikkmyq9q141h2drb80";
}; };
postUnpack = '' postUnpack = ''
@ -77,10 +78,10 @@ python3.pkgs.buildPythonApplication {
requests requests
tlslite-ng tlslite-ng
# plugins # plugins
btchip
ckcc-protocol ckcc-protocol
keepkey keepkey
trezor trezor
btchip
] ++ lib.optionals enableQt [ pyqt5 qdarkstyle ]; ] ++ lib.optionals enableQt [ pyqt5 qdarkstyle ];
preBuild = '' preBuild = ''
@ -112,7 +113,7 @@ python3.pkgs.buildPythonApplication {
wrapQtApp $out/bin/electrum wrapQtApp $out/bin/electrum
''; '';
checkInputs = with python3.pkgs; [ pytestCheckHook pycryptodomex ]; checkInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ];
pytestFlagsArray = [ "electrum/tests" ]; pytestFlagsArray = [ "electrum/tests" ];

View File

@ -1,13 +1,18 @@
{ lib, fetchPypi, buildPythonPackage, pythonOlder, attrs }: { lib
, fetchPypi
, buildPythonPackage
, pythonOlder
, attrs
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiorpcx"; pname = "aiorpcx";
version = "0.18.4"; version = "0.18.7";
src = fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "aiorpcX"; pname = "aiorpcX";
sha256 = "0jpvrkan6w8bpq017m8si7r9hb1pyw3ip4vr1fl2pmi8ngzc1jdy"; sha256 = "808a9ec9172df11677a0f7b459b69d1a6cf8b19c19da55541fa31fb1afce5ce7";
}; };
propagatedBuildInputs = [ attrs ]; propagatedBuildInputs = [ attrs ];
@ -17,9 +22,12 @@ buildPythonPackage rec {
# Checks needs internet access # Checks needs internet access
doCheck = false; doCheck = false;
meta = { pythonImportsCheck = [ "aiorpcx" ];
meta = with lib; {
description = "Transport, protocol and framing-independent async RPC client and server implementation"; description = "Transport, protocol and framing-independent async RPC client and server implementation";
license = lib.licenses.mit;
homepage = "https://github.com/kyuupichan/aiorpcX"; homepage = "https://github.com/kyuupichan/aiorpcX";
license = licenses.mit;
maintainers = with maintainers; [ prusnak ];
}; };
} }