Unverified Commit 9779ca85 authored by Pavol Rusnak's avatar Pavol Rusnak Committed by GitHub
Browse files

Merge pull request #281200 from andersrh/upgrade-electrum 

electrum: add QtWayland and certifi
parents b263ab4b 495b938c

pkgs/applications/misc/electrum/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
, secp256k1

, enableQt ? true

, callPackage

, qtwayland

}:



let
@@ -53,6 +54,7 @@ python3.pkgs.buildPythonApplication { 
  '';



  nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ];

  buildInputs = lib.optional stdenv.isLinux qtwayland;



  propagatedBuildInputs = with python3.pkgs; [

    aiohttp
@@ -70,6 +72,7 @@ python3.pkgs.buildPythonApplication { 
    qrcode

    requests

    tlslite-ng

    certifi

    # plugins

    btchip-python

    ledger-bitcoin

pkgs/applications/misc/electrum/grs.nix

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
, zbar

, secp256k1

, enableQt ? true

, qtwayland

}:



let
@@ -35,6 +36,7 @@ python3.pkgs.buildPythonApplication { 
  };



  nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ];

  buildInputs = lib.optional stdenv.isLinux qtwayland;



  propagatedBuildInputs = with python3.pkgs; [

    aiohttp
@@ -53,6 +55,7 @@ python3.pkgs.buildPythonApplication { 
    qrcode

    requests

    tlslite-ng

    certifi

    # plugins

    btchip-python

    ledger-bitcoin

pkgs/applications/misc/electrum/ltc.nix

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
, zbar

, secp256k1

, enableQt ? true

, qtwayland

}:



let
@@ -70,6 +71,7 @@ python3.pkgs.buildPythonApplication { 
    qrcode

    requests

    tlslite-ng

    certifi

    # plugins

    btchip-python

    ckcc-protocol
@@ -110,6 +112,7 @@ python3.pkgs.buildPythonApplication { 
  '';



  nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ];

  buildInputs = lib.optional stdenv.isLinux qtwayland;



  pytestFlagsArray = [ "electrum_ltc/tests" ];