From 9f0b60a08db9932dcb287282d51917dc1196405b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Jan 2025 09:45:16 -0800 Subject: [PATCH 1/3] python312Packages.ahocorapy: init at 1.6.2 --- .../python-modules/ahocorapy/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/ahocorapy/default.nix diff --git a/pkgs/development/python-modules/ahocorapy/default.nix b/pkgs/development/python-modules/ahocorapy/default.nix new file mode 100644 index 000000000000..cd4f90e8ae5c --- /dev/null +++ b/pkgs/development/python-modules/ahocorapy/default.nix @@ -0,0 +1,45 @@ +{ + buildPythonPackage, + fetchFromGitHub, + future, + lib, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "ahocorapy"; + version = "1.6.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "abusix"; + repo = "ahocorapy"; + tag = version; + hash = "sha256-ynVkDnrZ12dpNPoKfUdw0/X06aORFkmXFMVH9u0Payo="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + future + ]; + + pythonImportsCheck = [ "ahocorapy" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/ahocorapy_test.py" + ]; + + meta = { + changelog = "https://github.com/abusix/ahocorapy/blob/${src.tag}/CHANGELOG"; + description = "Pure python Aho-Corasick library"; + homepage = "https://github.com/abusix/ahocorapy"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 959365d03a30..cc05102e2f8d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -131,6 +131,8 @@ self: super: with self; { aggdraw = callPackage ../development/python-modules/aggdraw { }; + ahocorapy = callPackage ../development/python-modules/ahocorapy { }; + ahocorasick-rs = callPackage ../development/python-modules/ahocorasick-rs { }; aigpy = callPackage ../development/python-modules/aigpy { }; From 14a209797201a28c3bca21dcb12229d6168df9d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Jan 2025 09:41:40 -0800 Subject: [PATCH 2/3] python312Packages.beacontools: init at 2.1.0 --- .../python-modules/beacontools/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/beacontools/default.nix diff --git a/pkgs/development/python-modules/beacontools/default.nix b/pkgs/development/python-modules/beacontools/default.nix new file mode 100644 index 000000000000..8e6315db900f --- /dev/null +++ b/pkgs/development/python-modules/beacontools/default.nix @@ -0,0 +1,53 @@ +{ + ahocorapy, + buildPythonPackage, + construct, + fetchFromGitHub, + lib, + pybluez, + pytestCheckHook, + setuptools, + stdenv, +}: + +buildPythonPackage rec { + pname = "beacontools"; + version = "2.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "citruz"; + repo = "beacontools"; + tag = "v${version}"; + hash = "sha256-3a/HDssOqIfReSijRvmiXwuZjvWLJfDaDyUdA2vv/jA="; + }; + + build-system = [ setuptools ]; + + pythonRelaxDeps = [ + "ahocorapy" + ]; + + dependencies = [ + ahocorapy + construct + ]; + + optional-dependencies = { + scan = lib.optionals stdenv.hostPlatform.isLinux [ pybluez ]; + }; + + pythonImportsCheck = [ "beacontools" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/citruz/beacontools/releases/tag/${src.tag}"; + description = "Python library for working with various types of Bluetooth LE Beacons"; + homepage = "https://github.com/citruz/beacontools"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cc05102e2f8d..8b08a9a7abfa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1567,6 +1567,8 @@ self: super: with self; { bdffont = callPackage ../development/python-modules/bdffont { }; + beacontools = callPackage ../development/python-modules/beacontools { }; + beaker = callPackage ../development/python-modules/beaker { }; before-after = callPackage ../development/python-modules/before-after { }; From 2c596c1cb249ccf41c48bb3988b4fafd7a5bdc65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Jan 2025 09:50:34 -0800 Subject: [PATCH 3/3] home-assistant: support eddystone_temperature component --- pkgs/servers/home-assistant/component-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 11305c417806..464c96cd15e5 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1323,8 +1323,12 @@ aioecowitt ]; "eddystone_temperature" = - ps: with ps; [ - ]; # missing inputs: beacontools + ps: + with ps; + [ + beacontools + ] + ++ beacontools.optional-dependencies.scan; "edimax" = ps: with ps; [ pyedimax