diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index fe263dd6692..c852620d798 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -3,35 +3,45 @@ python3Packages.buildPythonApplication rec { pname = "electron-cash"; - version = "4.2.0"; + version = "4.2.4"; src = fetchFromGitHub { owner = "Electron-Cash"; repo = "Electron-Cash"; rev = version; - sha256 = "0ixsx4224jilc5zis6wbsbxqxv10mm5sksrzq15xp30zz0bzb6md"; + sha256 = "sha256-hiOS0cTaPqllb31p+6nU4GYvw/E1Hdn8yd3sppzGkqg="; }; propagatedBuildInputs = with python3Packages; [ - dnspython - ecdsa - jsonrpclib-pelix - matplotlib - pbkdf2 + # requirements pyaes - pycrypto - pyqt5 - pysocks - qrcode + ecdsa requests - tlslite-ng + qrcode + protobuf + jsonrpclib-pelix + pysocks qdarkstyle + python-dateutil stem + certifi + pathvalidate + dnspython - # plugins - keepkey + # requirements-binaries + pyqt5 + psutil + pycryptodomex + cryptography + + # requirements-hw + cython trezor + keepkey btchip + hidapi + pyscard + pysatochip ]; nativeBuildInputs = [ wrapQtAppsHook ]; @@ -83,7 +93,7 @@ python3Packages.buildPythonApplication rec { ''; homepage = "https://www.electroncash.org/"; platforms = platforms.linux; - maintainers = with maintainers; [ lassulus nyanloutre ]; + maintainers = with maintainers; [ lassulus nyanloutre oxalica ]; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pathvalidate/default.nix b/pkgs/development/python-modules/pathvalidate/default.nix new file mode 100644 index 00000000000..75dff606e9b --- /dev/null +++ b/pkgs/development/python-modules/pathvalidate/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder }: + +buildPythonPackage rec { + pname = "pathvalidate"; + version = "2.4.1"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-PJvZTH7CPpz7IR/741audfl51sCZosdF7pSQ9STzJGg="; + }; + + # Requires `pytest-md-report`, causing infinite recursion. + doCheck = false; + + pythonImportsCheck = [ "pathvalidate" ]; + + meta = with lib; { + description = "A Python library to sanitize/validate a string such as filenames/file-paths/etc"; + homepage = "https://github.com/thombashi/pathvalidate"; + license = licenses.mit; + maintainers = with maintainers; [ oxalica ]; + }; +} diff --git a/pkgs/development/python-modules/pysatochip/default.nix b/pkgs/development/python-modules/pysatochip/default.nix new file mode 100644 index 00000000000..f24571a78cf --- /dev/null +++ b/pkgs/development/python-modules/pysatochip/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, pyscard, ecdsa, pyaes +, pythonOlder }: + +buildPythonPackage rec { + pname = "pysatochip"; + version = "0.11.4"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Jj/zZIS9aXmZ2xdi29Eun7iRIrIk9oBlrtN9+6opIMo="; + }; + + propagatedBuildInputs = [ pyscard ecdsa pyaes ]; + + pythonImportsCheck = [ "pysatochip" ]; + + meta = with lib; { + description = "Simple python library to communicate with a Satochip hardware wallet"; + homepage = "https://github.com/Toporin/pysatochip"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ oxalica ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e30bc409c84..d1cdbd4a8c4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5008,6 +5008,8 @@ in { pathtools = callPackage ../development/python-modules/pathtools { }; + pathvalidate = callPackage ../development/python-modules/pathvalidate { }; + patiencediff = callPackage ../development/python-modules/patiencediff { }; patool = callPackage ../development/python-modules/patool { }; @@ -6271,6 +6273,8 @@ in { inherit (pkgs) xmlsec; }; + pysatochip = callPackage ../development/python-modules/pysatochip { }; + pysc2 = callPackage ../development/python-modules/pysc2 { }; pyscard = callPackage ../development/python-modules/pyscard {