From 595501a3a1982fe8cdcc1122eabc3e0d695cd66c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 13:01:36 +0200 Subject: [PATCH] python311Packages.raincloudy: refactor --- .../python-modules/raincloudy/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/raincloudy/default.nix b/pkgs/development/python-modules/raincloudy/default.nix index 3a247bc6a81ed..16d6f39b13eec 100644 --- a/pkgs/development/python-modules/raincloudy/default.nix +++ b/pkgs/development/python-modules/raincloudy/default.nix @@ -19,33 +19,33 @@ buildPythonPackage rec { pname = "raincloudy"; version = "1.2.0"; - format = "setuptools"; + pypriject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "vanstinator"; - repo = pname; + repo = "raincloudy"; rev = "refs/tags/${version}"; hash = "sha256-qCkBVirM09iA1sXiOB9FJns8bHjQq7rRk8XbRWrtBDI="; }; - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; - postPatch = '' # https://github.com/vanstinator/raincloudy/pull/60 substituteInPlace setup.py \ - --replace "bs4" "beautifulsoup4" \ + --replace-fail "bs4" "beautifulsoup4" \ # fix raincloudy.aio package discovery, by relying on # autodiscovery instead. sed -i '/packages=/d' setup.py ''; - propagatedBuildInputs = [ + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ aiohttp requests beautifulsoup4 @@ -74,7 +74,8 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with Melnor RainCloud Smart Garden Watering Irrigation Timer"; homepage = "https://github.com/vanstinator/raincloudy"; - license = with licenses; [ asl20 ]; + changelog = "https://github.com/vanstinator/raincloudy/releases/tag/${version}"; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; }