From 3fabc35312fddd42a411b75ae0c1ca9d3c599462 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Apr 2024 11:41:50 +0200 Subject: [PATCH 1/3] python312Packages.nettigo-air-monitor: refactor --- .../python-modules/nettigo-air-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 538aec6b4f24..1e684e83e767 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { hash = "sha256-Z88IkXQi9Uqc+HX++Cp5nj4S0puwMfToqXzBCnbG59g="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp aqipy-atmotech dacite From dfadf9d7da174e74a4cde80a4afa6cb2c74b3948 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Apr 2024 11:42:44 +0200 Subject: [PATCH 2/3] python312Packages.nettigo-air-monitor: 2.2.2 -> 3.0.0 Diff: https://github.com/bieniu/nettigo-air-monitor/compare/refs/tags/2.2.2...3.0.0 Changelog: https://github.com/bieniu/nettigo-air-monitor/releases/tag/3.0.0 --- .../python-modules/nettigo-air-monitor/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 1e684e83e767..11b7fb64c52a 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -10,20 +10,21 @@ , pytestCheckHook , pythonOlder , setuptools +, syrupy }: buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "2.2.2"; + version = "3.0.0"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "bieniu"; repo = "nettigo-air-monitor"; rev = "refs/tags/${version}"; - hash = "sha256-Z88IkXQi9Uqc+HX++Cp5nj4S0puwMfToqXzBCnbG59g="; + hash = "sha256-aiJoY+6sNfBmE1057UuMjV80hjVJ29t2X16IIe6dxWs="; }; build-system = [ @@ -41,6 +42,7 @@ buildPythonPackage rec { pytest-asyncio pytest-error-for-skips pytestCheckHook + syrupy ]; pythonImportsCheck = [ From 2418a1bdb1fb3f5690a2cf559446bffe66b25b39 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Apr 2024 11:42:57 +0200 Subject: [PATCH 3/3] python312Packages.nettigo-air-monitor: format with nixfmt --- .../nettigo-air-monitor/default.nix | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 11b7fb64c52a..a33f9d528630 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -1,16 +1,17 @@ -{ lib -, aiohttp -, aioresponses -, aqipy-atmotech -, buildPythonPackage -, dacite -, fetchFromGitHub -, pytest-asyncio -, pytest-error-for-skips -, pytestCheckHook -, pythonOlder -, setuptools -, syrupy +{ + lib, + aiohttp, + aioresponses, + aqipy-atmotech, + buildPythonPackage, + dacite, + fetchFromGitHub, + pytest-asyncio, + pytest-error-for-skips, + pytestCheckHook, + pythonOlder, + setuptools, + syrupy, }: buildPythonPackage rec { @@ -27,9 +28,7 @@ buildPythonPackage rec { hash = "sha256-aiJoY+6sNfBmE1057UuMjV80hjVJ29t2X16IIe6dxWs="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ aiohttp @@ -45,9 +44,7 @@ buildPythonPackage rec { syrupy ]; - pythonImportsCheck = [ - "nettigo_air_monitor" - ]; + pythonImportsCheck = [ "nettigo_air_monitor" ]; meta = with lib; { description = "Python module to get air quality data from Nettigo Air Monitor devices";