From 7845fa08042e3093fcd65a4c8d0dbbd3725468d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Feb 2024 19:45:32 +0000 Subject: [PATCH 1/2] python311Packages.sense-energy: 0.12.2 -> 0.12.3 --- pkgs/development/python-modules/sense-energy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index 35c0b4b6f4f8..7379dfe3b51b 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.12.2"; + version = "0.12.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "scottbonline"; repo = "sense"; rev = "refs/tags/${version}"; - hash = "sha256-OVFRM31LwHNeJUx+s/TN/1o4wvjMQEKaZEPI+y+S64s="; + hash = "sha256-aAPDYg5ttOAkKF5c1ft2apIQoReh4t22+78PtmLZNlI="; }; postPatch = '' From f131fbc5e8207dcd200806e9cb574e2fb60ef5b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Feb 2024 13:55:38 -0800 Subject: [PATCH 2/2] python311Packages.sense-energy: refactor --- pkgs/development/python-modules/sense-energy/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index 7379dfe3b51b..cc91f276c0e7 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , aiohttp , ciso8601 , async-timeout @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "sense-energy"; version = "0.12.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -28,9 +29,13 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "{{VERSION_PLACEHOLDER}}" "${version}" + --replace-fail "{{VERSION_PLACEHOLDER}}" "${version}" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp async-timeout