diff --git a/pkgs/development/python-modules/shamir-mnemonic/default.nix b/pkgs/development/python-modules/shamir-mnemonic/default.nix index 11d580eaf889..13303cceba89 100644 --- a/pkgs/development/python-modules/shamir-mnemonic/default.nix +++ b/pkgs/development/python-modules/shamir-mnemonic/default.nix @@ -1,36 +1,31 @@ { lib, buildPythonPackage, - isPy3k, fetchFromGitHub, - attrs, + poetry-core, click, colorama, - pytestCheckHook, }: buildPythonPackage rec { pname = "shamir-mnemonic"; - version = "0.2.2"; - format = "setuptools"; - - disabled = !isPy3k; + version = "0.3.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "trezor"; repo = "python-${pname}"; - rev = "v${version}"; - hash = "sha256-b9tBXN9dBdAeGg3xf5ZBdd6kPpFzseJl6wRTTfNZEwo="; + tag = "v${version}"; + hash = "sha256-KjZbxA92h25ghbItdmPvkSPvDZUSRWkl4vnJDBMN71s="; }; + build-system = [ poetry-core ]; + propagatedBuildInputs = [ - attrs click colorama ]; - nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "shamir_mnemonic" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/slip10/default.nix b/pkgs/development/python-modules/slip10/default.nix new file mode 100644 index 000000000000..57478107a20d --- /dev/null +++ b/pkgs/development/python-modules/slip10/default.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + base58, + cryptography, + ecdsa, +}: + +buildPythonPackage rec { + pname = "slip10"; + version = "1.0.1"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ArNQrlV7WReRQosXVR+V16xX6SEfN969yBTJC0oSOlQ="; + }; + + build-system = [ poetry-core ]; + + propagatedBuildInputs = [ + base58 + cryptography + ecdsa + ]; + + pythonImportsCheck = [ "slip10" ]; + + meta = with lib; { + description = "Minimalistic implementation of SLIP109"; + homepage = "https://github.com/trezor/python-slip10"; + license = licenses.bsd3; + maintainers = with maintainers; [ + prusnak + ]; + }; +} diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 62c94ce4bd7c..2b3147874c59 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -6,11 +6,14 @@ click, construct, construct-classes, + cryptography, ecdsa, libusb1, mnemonic, requests, setuptools, + shamir-mnemonic, + slip10, typing-extensions, trezor-udev-rules, pytestCheckHook, @@ -18,12 +21,12 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.13.9"; + version = "0.13.10"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-lFC9e7nSPl4zo8nljhjwWLRMnZw0ymZLSYGnlaqfse8="; + hash = "sha256-egtq5GKN0MMaXOtRJYkY2bvdOthROIg3IlgmsijuUE8="; }; build-system = [ setuptools ]; @@ -32,10 +35,13 @@ buildPythonPackage rec { click construct construct-classes + cryptography ecdsa libusb1 mnemonic requests + shamir-mnemonic + slip10 typing-extensions ] ++ lib.optionals stdenv.hostPlatform.isLinux [ trezor-udev-rules ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ee049681963..b634be25d594 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15124,6 +15124,8 @@ self: super: with self; { slicerator = callPackage ../development/python-modules/slicerator { }; + slip10 = callPackage ../development/python-modules/slip10 { }; + slither-analyzer = callPackage ../development/python-modules/slither-analyzer { }; slimit = callPackage ../development/python-modules/slimit { };