Merge pull request #281200 from andersrh/upgrade-electrum
electrum: add QtWayland and certifi
This commit is contained in:
commit
9779ca85b3
3 changed files with 9 additions and 0 deletions
|
@ -8,6 +8,7 @@
|
||||||
, secp256k1
|
, secp256k1
|
||||||
, enableQt ? true
|
, enableQt ? true
|
||||||
, callPackage
|
, callPackage
|
||||||
|
, qtwayland
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -53,6 +54,7 @@ python3.pkgs.buildPythonApplication {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ];
|
nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ];
|
||||||
|
buildInputs = lib.optional stdenv.isLinux qtwayland;
|
||||||
|
|
||||||
propagatedBuildInputs = with python3.pkgs; [
|
propagatedBuildInputs = with python3.pkgs; [
|
||||||
aiohttp
|
aiohttp
|
||||||
|
@ -70,6 +72,7 @@ python3.pkgs.buildPythonApplication {
|
||||||
qrcode
|
qrcode
|
||||||
requests
|
requests
|
||||||
tlslite-ng
|
tlslite-ng
|
||||||
|
certifi
|
||||||
# plugins
|
# plugins
|
||||||
btchip-python
|
btchip-python
|
||||||
ledger-bitcoin
|
ledger-bitcoin
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
, zbar
|
, zbar
|
||||||
, secp256k1
|
, secp256k1
|
||||||
, enableQt ? true
|
, enableQt ? true
|
||||||
|
, qtwayland
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -35,6 +36,7 @@ python3.pkgs.buildPythonApplication {
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ];
|
nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ];
|
||||||
|
buildInputs = lib.optional stdenv.isLinux qtwayland;
|
||||||
|
|
||||||
propagatedBuildInputs = with python3.pkgs; [
|
propagatedBuildInputs = with python3.pkgs; [
|
||||||
aiohttp
|
aiohttp
|
||||||
|
@ -53,6 +55,7 @@ python3.pkgs.buildPythonApplication {
|
||||||
qrcode
|
qrcode
|
||||||
requests
|
requests
|
||||||
tlslite-ng
|
tlslite-ng
|
||||||
|
certifi
|
||||||
# plugins
|
# plugins
|
||||||
btchip-python
|
btchip-python
|
||||||
ledger-bitcoin
|
ledger-bitcoin
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
, zbar
|
, zbar
|
||||||
, secp256k1
|
, secp256k1
|
||||||
, enableQt ? true
|
, enableQt ? true
|
||||||
|
, qtwayland
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -70,6 +71,7 @@ python3.pkgs.buildPythonApplication {
|
||||||
qrcode
|
qrcode
|
||||||
requests
|
requests
|
||||||
tlslite-ng
|
tlslite-ng
|
||||||
|
certifi
|
||||||
# plugins
|
# plugins
|
||||||
btchip-python
|
btchip-python
|
||||||
ckcc-protocol
|
ckcc-protocol
|
||||||
|
@ -110,6 +112,7 @@ python3.pkgs.buildPythonApplication {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ];
|
nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ];
|
||||||
|
buildInputs = lib.optional stdenv.isLinux qtwayland;
|
||||||
|
|
||||||
pytestFlagsArray = [ "electrum_ltc/tests" ];
|
pytestFlagsArray = [ "electrum_ltc/tests" ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue