diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/electrum')
-rw-r--r-- | nixpkgs/pkgs/applications/misc/electrum/default.nix | 11 | ||||
-rw-r--r-- | nixpkgs/pkgs/applications/misc/electrum/grs.nix | 3 | ||||
-rw-r--r-- | nixpkgs/pkgs/applications/misc/electrum/ltc.nix | 3 |
3 files changed, 14 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/applications/misc/electrum/default.nix b/nixpkgs/pkgs/applications/misc/electrum/default.nix index a1300983d28f..91820ce964dd 100644 --- a/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -8,10 +8,11 @@ , secp256k1 , enableQt ? true , callPackage +, qtwayland }: let - version = "4.4.6"; + version = "4.5.0"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.{v}" @@ -28,7 +29,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "sha256-nd435CgF0a6JOni/OXcxkciVCR1aQqzfGfDSg1gPQ8Q="; + sha256 = "sha256-IEKuHUlH+dg+8w+n7XV7hdDOPOFZ/lpUsIlYldwR44Y="; postFetch = '' mv $out ./all @@ -44,7 +45,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "sha256-BxxC1xVKToUjgBo4mEeK9Tdhbd/+doHcTTJsXDtaELg="; + sha256 = "sha256-s4FH8FtPg4wepU/5XI062dAN9fCYR1xJGwrxftCSKzw="; }; postUnpack = '' @@ -53,6 +54,7 @@ python3.pkgs.buildPythonApplication { ''; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; + buildInputs = lib.optional (stdenv.isLinux && enableQt) qtwayland; propagatedBuildInputs = with python3.pkgs; [ aiohttp @@ -70,6 +72,8 @@ python3.pkgs.buildPythonApplication { qrcode requests tlslite-ng + certifi + jsonpatch # plugins btchip-python ledger-bitcoin @@ -133,5 +137,6 @@ python3.pkgs.buildPythonApplication { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ joachifm np prusnak ]; + mainProgram = "electrum"; }; } diff --git a/nixpkgs/pkgs/applications/misc/electrum/grs.nix b/nixpkgs/pkgs/applications/misc/electrum/grs.nix index 4850cfeb1da5..87a85e9f986d 100644 --- a/nixpkgs/pkgs/applications/misc/electrum/grs.nix +++ b/nixpkgs/pkgs/applications/misc/electrum/grs.nix @@ -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 diff --git a/nixpkgs/pkgs/applications/misc/electrum/ltc.nix b/nixpkgs/pkgs/applications/misc/electrum/ltc.nix index 83738fd18149..844a49974b8f 100644 --- a/nixpkgs/pkgs/applications/misc/electrum/ltc.nix +++ b/nixpkgs/pkgs/applications/misc/electrum/ltc.nix @@ -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" ]; |