From 1cedd70d3c682831956435700c98b5bdf4dac577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 21 Jul 2024 08:46:30 -0700 Subject: [PATCH 1/3] python312Packages.volkswagencarnet: init at 5.0.2 --- .../volkswagencarnet/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/volkswagencarnet/default.nix diff --git a/pkgs/development/python-modules/volkswagencarnet/default.nix b/pkgs/development/python-modules/volkswagencarnet/default.nix new file mode 100644 index 000000000000..9335402ea3f9 --- /dev/null +++ b/pkgs/development/python-modules/volkswagencarnet/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools-scm, + aiohttp, + beautifulsoup4, + lxml, + pyjwt, + freezegun, + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "volkswagencarnet"; + version = "5.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "robinostlund"; + repo = "volkswagencarnet"; + rev = "refs/tags/v${version}"; + hash = "sha256-NpfkhFGxd3VjLjQ8pPpamYgwc5zqWt5CojONe4L1s4s="; + }; + + postPatch = '' + substituteInPlace tests/conftest.py \ + --replace-fail 'pytest_plugins = ["pytest_cov"]' 'pytest_plugins = []' + ''; + + build-system = [ setuptools-scm ]; + + dependencies = [ + aiohttp + beautifulsoup4 + lxml + pyjwt + ]; + + pythonImportsCheck = [ "volkswagencarnet" ]; + + nativeCheckInputs = [ + freezegun + pytest-asyncio + pytestCheckHook + ]; + + meta = { + description = "A python library for volkswagen carnet"; + homepage = "https://github.com/robinostlund/volkswagencarnet"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b5ce6f7083e3..4ee951cfc789 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17040,6 +17040,8 @@ self: super: with self; { volatile = callPackage ../development/python-modules/volatile { }; + volkswagencarnet = callPackage ../development/python-modules/volkswagencarnet { }; + volkszaehler = callPackage ../development/python-modules/volkszaehler { }; voluptuous = callPackage ../development/python-modules/voluptuous { }; From 069bcc707470f999953ab72373612df7b3255750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 21 Jul 2024 14:45:07 -0700 Subject: [PATCH 2/3] home-assistant-custom-components.volkswagencarnet: init at 5.0.3 --- .../custom-components/default.nix | 2 + .../volkswagencarnet/default.nix | 38 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/servers/home-assistant/custom-components/volkswagencarnet/default.nix diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index 3687e3ac7cf0..8d573010cf9a 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -60,6 +60,8 @@ tuya_local = callPackage ./tuya_local {}; + volkswagencarnet = callPackage ./volkswagencarnet { }; + waste_collection_schedule = callPackage ./waste_collection_schedule {}; xiaomi_gateway3 = callPackage ./xiaomi_gateway3 {}; diff --git a/pkgs/servers/home-assistant/custom-components/volkswagencarnet/default.nix b/pkgs/servers/home-assistant/custom-components/volkswagencarnet/default.nix new file mode 100644 index 000000000000..d39c5f3481dc --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/volkswagencarnet/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, + volkswagencarnet, + pytest-homeassistant-custom-component, + pytestCheckHook, +}: + +buildHomeAssistantComponent rec { + owner = "robinostlund"; + domain = "volkswagencarnet"; + version = "5.0.3"; + + src = fetchFromGitHub { + owner = "robinostlund"; + repo = "homeassistant-volkswagencarnet"; + rev = "refs/tags/v${version}"; + hash = "sha256-3wykS2TYjr9hoQSPc1F3m5aDiLW1tzvQfjfjnr4N2Y0="; + }; + + dependencies = [ volkswagencarnet ]; + + nativeCheckInputs = [ + pytest-homeassistant-custom-component + pytestCheckHook + ]; + + # https://github.com/robinostlund/homeassistant-volkswagencarnet/issues/651 + doCheck = false; + + meta = { + description = "Volkswagen Connect component for Home Assistant"; + homepage = "https://github.com/robinostlund/homeassistant-volkswagencarnet"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} From e4bd95e81c2ccbdf6c200e3d09b40081d3c55bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 21 Jul 2024 14:45:57 -0700 Subject: [PATCH 3/3] home-assistant-custom-components: fix typo --- pkgs/servers/home-assistant/custom-components/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/custom-components/README.md b/pkgs/servers/home-assistant/custom-components/README.md index 6b942df8b942..238c320ba279 100644 --- a/pkgs/servers/home-assistant/custom-components/README.md +++ b/pkgs/servers/home-assistant/custom-components/README.md @@ -20,7 +20,7 @@ versions into the Python environment. ```nix { lib -, buildHomeAssistantcomponent +, buildHomeAssistantComponent , fetchFromGitHub }: