From f0569c8d96e1e6f1f0cc5dbbbe10a4503731be0c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 13:05:08 +0200 Subject: [PATCH 1/3] python310Packages.ndeflib: init at 0.3.3 --- .../python-modules/ndeflib/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/ndeflib/default.nix diff --git a/pkgs/development/python-modules/ndeflib/default.nix b/pkgs/development/python-modules/ndeflib/default.nix new file mode 100644 index 000000000000..3699955627ec --- /dev/null +++ b/pkgs/development/python-modules/ndeflib/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "ndeflib"; + version = "0.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "nfcpy"; + repo = "ndeflib"; + rev = "refs/tags/v${version}"; + hash = "sha256-cpfztE+/AW7P0J7QeTDfVGYc2gEkr7gzA352hC9bdTM="; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ndef" + ]; + + disabledTests = [ + # AssertionError caused due to wrong size + "test_decode_error" + ]; + + meta = with lib; { + description = "Python package for parsing and generating NFC Data Exchange Format messages"; + homepage = "https://github.com/nfcpy/ndeflib"; + license = licenses.isc; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc2bb0ced484..7e18d1cd6032 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6500,6 +6500,8 @@ self: super: with self; { nclib = callPackage ../development/python-modules/nclib { }; + ndeflib = callPackage ../development/python-modules/ndeflib { }; + ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { }; ndindex = callPackage ../development/python-modules/ndindex { }; From 1d3ffa6fbca2ccbd67c3a26668c95b301ab5b7d8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 13:22:32 +0200 Subject: [PATCH 2/3] python310Packages.ledgerblue: 0.1.41 -> 0.1.47 --- pkgs/development/python-modules/ledgerblue/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index be5b87146901..d6b316b3db1f 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -8,8 +8,9 @@ , protobuf , pycrypto , pycryptodomex -, pythonOlder +, pyelftools , python-u2flib-host +, pythonOlder , websocket-client }: @@ -33,6 +34,7 @@ buildPythonPackage rec { protobuf pycrypto pycryptodomex + pyelftools python-u2flib-host websocket-client ]; From 540c7b84b6daf602876cc13b9b8554cacb74e5ed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 13:38:54 +0200 Subject: [PATCH 3/3] python310Packages.nfcpy: init at 1.0.4 --- .../python-modules/ledgerblue/default.nix | 8 ++- .../python-modules/nfcpy/default.nix | 61 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/nfcpy/default.nix diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index d6b316b3db1f..ea89a9ac688f 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -1,9 +1,11 @@ { lib +, bleak , buildPythonPackage , ecpy , fetchPypi , future , hidapi +, nfcpy , pillow , protobuf , pycrypto @@ -16,20 +18,22 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.44"; + version = "0.1.47"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pOLpeej10G7Br8juTuQOSuCbhMjAP4aY0/JwnmJRblk="; + hash = "sha256-xe8ude2JzrdmJqwzqLlxRO697IjcGuQgGG6c3nQ/drg="; }; propagatedBuildInputs = [ + bleak ecpy future hidapi + nfcpy pillow protobuf pycrypto diff --git a/pkgs/development/python-modules/nfcpy/default.nix b/pkgs/development/python-modules/nfcpy/default.nix new file mode 100644 index 000000000000..bf5f538da33c --- /dev/null +++ b/pkgs/development/python-modules/nfcpy/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, libusb1 +, mock +, ndeflib +, pydes +, pyserial +, pytest-mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "nfcpy"; + version = "1.0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "nfcpy"; + repo = "nfcpy"; + rev = "refs/tags/v${version}"; + hash = "sha256-HFWOCiz6ISfxEeC6KPKNKGZoHvFjFGUn7QJWnwvJKYw="; + }; + + propagatedBuildInputs = [ + libusb1 + ndeflib + pydes + pyserial + ]; + + nativeCheckInputs = [ + mock + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nfc" + ]; + + disabledTestPaths = [ + # AttributeError: 'NoneType' object has no attribute 'EC_KEY' + "tests/test_llcp_llc.py" + "tests/test_llcp_sec.py" + # Doesn't work on Hydra + "tests/test_clf_udp.py" + ]; + + meta = with lib; { + description = "A Python module to read/write NFC tags or communicate with another NFC device"; + homepage = "https://github.com/nfcpy/nfcpy"; + changelog = "https://github.com/nfcpy/nfcpy/blob/v${version}/HISTORY.rst"; + license = licenses.eupl11; + maintainers = with maintainers; [ fab ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e18d1cd6032..a519ef815bb1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6566,6 +6566,8 @@ self: super: with self; { nextdns = callPackage ../development/python-modules/nextdns { }; + nfcpy = callPackage ../development/python-modules/nfcpy { }; + nftables = toPythonModule (pkgs.nftables.override { python3 = python; withPython = true;