From dc41a2fc0c24ed4ff85d745a4826e6e6b06f966a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 16 Oct 2023 16:56:55 +0200 Subject: [PATCH 1/3] python311Packages.pylutron-caseta: 0.18.2 -> 0.18.3 https://github.com/gurumitts/pylutron-caseta/blob/v0.18.3/CHANGELOG.md --- .../python-modules/pylutron-caseta/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index fd9ca66daebe..e069e902687f 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -1,9 +1,9 @@ { lib +, async-timeout , buildPythonPackage , cryptography , fetchFromGitHub , pytest-asyncio -, pytest-sugar , pytest-timeout , pytestCheckHook , pythonOlder @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.18.2"; + version = "0.18.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gurumitts"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GyYJZIjvy4JYNCUUJpQxt32U8lMS/iQoz4llbCmJQhU="; + hash = "sha256-tjmMu7LUne+hLLTXGqHhci9/PZiuQ10mQaARvL2sdIM="; }; nativeBuildInputs = [ @@ -34,9 +34,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio - pytest-sugar pytest-timeout pytestCheckHook + ] ++ lib.optionals (pythonOlder "3.11") [ + async-timeout ]; pytestFlagsArray = [ From d3b60a85dff1e6754d1a41864f833f2e09d73cf2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 16 Oct 2023 17:01:24 +0200 Subject: [PATCH 2/3] home-assistant: 2023.10.1 -> 2023.10.3 https://github.com/home-assistant/core/releases/tag/2023.10.2 https://github.com/home-assistant/core/releases/tag/2023.10.3 --- pkgs/servers/home-assistant/component-packages.nix | 3 +-- pkgs/servers/home-assistant/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0d608126f8ab..128f20777fe2 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.10.1"; + version = "2023.10.3"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -2485,7 +2485,6 @@ maxcube-api ]; "mazda" = ps: with ps; [ - pymazda ]; "meater" = ps: with ps; [ meater-python diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 3a520a379044..9bc35bd882c9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -296,7 +296,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.10.1"; + hassVersion = "2023.10.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -312,7 +312,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-3VkV5DirOzLO9Qbo4s5of5Aie7JvSAN7hgHBTA8koAE="; + hash = "sha256-7Eg6Ik8eiPPUTXyRedQLixaCnHDg9Dmikmhcq55+458="; }; # Secondary source is git for tests @@ -320,7 +320,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-mzj4JJ81Wr5FO1lVVwHlgnS3olxzXzMw0lFYPbTf634="; + hash = "sha256-4J1BBC6PvfbN4fKD+zUpW19sMvoKALilitNJlwB0ZTk="; }; nativeBuildInputs = with python.pkgs; [ From 391e4ef53490575c11250a5efda97c0aca07cf5e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 16 Oct 2023 17:03:26 +0200 Subject: [PATCH 3/3] python311Packages.pymazda: remove The upstream repo is gone, because of a DCMA claim by Mazda. --- .../python-modules/pymazda/default.nix | 45 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 pkgs/development/python-modules/pymazda/default.nix diff --git a/pkgs/development/python-modules/pymazda/default.nix b/pkgs/development/python-modules/pymazda/default.nix deleted file mode 100644 index b0b83ca84038..000000000000 --- a/pkgs/development/python-modules/pymazda/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, aiohttp -, buildPythonPackage -, cryptography -, fetchPypi -, poetry-core -, pythonOlder -}: - -buildPythonPackage rec { - pname = "pymazda"; - version = "0.3.11"; - format = "pyproject"; - - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-DiXLY4mfgRbE0Y1tOJnkMSQQj1vcySLVDBthOWe7/dM="; - }; - - nativeBuildInputs = [ - poetry-core - ]; - - propagatedBuildInputs = [ - aiohttp - cryptography - ]; - - # Project has no tests - doCheck = false; - - pythonImportsCheck = [ - "pymazda" - ]; - - meta = with lib; { - description = "Python client for interacting with the MyMazda API"; - homepage = "https://github.com/bdr99/pymazda"; - changelog = "https://github.com/bdr99/pymazda/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 9d39469d2dc7..6d28fd6dc2f1 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -285,6 +285,7 @@ mapAliases ({ pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 PyLD = pyld; # added 2022-06-22 pymatgen-lammps = throw "pymatgen-lammps has been removed because it is unmaintained and broken"; # added 2023-06-20 + pymazda = throw "pymazda has been removed, because the upstream repo has been affected by a DCMA claim."; # added 2023-10-16 pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 PyMVGLive = pymvglive; # added 2023-02-19 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2b7d70991bfc..7351988a0fcb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10352,8 +10352,6 @@ self: super: with self; { pymavlink = callPackage ../development/python-modules/pymavlink { }; - pymazda = callPackage ../development/python-modules/pymazda { }; - pymbolic = callPackage ../development/python-modules/pymbolic { }; pymc = callPackage ../development/python-modules/pymc { };