From 01ec2ee0e7c1b3c6a872fd7fa8cd72b2a1298945 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 May 2024 15:18:04 +0200 Subject: [PATCH 1/2] python312Packages.oemthermostat: refactor --- .../python-modules/oemthermostat/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/oemthermostat/default.nix b/pkgs/development/python-modules/oemthermostat/default.nix index f40e39f10bf6..8f0e6a6a6370 100644 --- a/pkgs/development/python-modules/oemthermostat/default.nix +++ b/pkgs/development/python-modules/oemthermostat/default.nix @@ -10,22 +10,22 @@ buildPythonPackage rec { pname = "oemthermostat"; version = "1.1.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Cadair"; repo = "openenergymonitor_thermostat"; - rev = "v${version}"; - sha256 = "vrMw3/X8MtejO1WyUA1DOlfVCPTCPgcK5p3+OlTWcM4="; + rev = "refs/tags/v${version}"; + hash = "sha256-vrMw3/X8MtejO1WyUA1DOlfVCPTCPgcK5p3+OlTWcM4="; }; - nativeBuildInputs = [ + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ requests ]; @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to interact with OpenEnergyMonitor thermostats"; homepage = "https://github.com/Cadair/openenergymonitor_thermostat"; + changelog = "https://github.com/Cadair/openenergymonitor_thermostat/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; From 964f774eeb8132eff7dc9d791591b729b6e3eb37 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 May 2024 15:18:39 +0200 Subject: [PATCH 2/2] python312Packages.oemthermostat: format with nixfmt --- .../python-modules/oemthermostat/default.nix | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/oemthermostat/default.nix b/pkgs/development/python-modules/oemthermostat/default.nix index 8f0e6a6a6370..154a3f7f1e6b 100644 --- a/pkgs/development/python-modules/oemthermostat/default.nix +++ b/pkgs/development/python-modules/oemthermostat/default.nix @@ -1,10 +1,11 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, requests -, setuptools-scm +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + requests, + setuptools-scm, }: buildPythonPackage rec { @@ -21,21 +22,13 @@ buildPythonPackage rec { hash = "sha256-vrMw3/X8MtejO1WyUA1DOlfVCPTCPgcK5p3+OlTWcM4="; }; - build-system = [ - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - dependencies = [ - requests - ]; + dependencies = [ requests ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "oemthermostat" - ]; + pythonImportsCheck = [ "oemthermostat" ]; meta = with lib; { description = "Python module to interact with OpenEnergyMonitor thermostats";