From 7bdd2ba1367d4ebe4a1379e64140e8a48b58b293 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Jun 2024 10:28:11 +0200 Subject: [PATCH 1/2] python312Packages.adguardhome: 0.6.3 -> 0.7.0 Diff: https://github.com/frenck/python-adguardhome/compare/refs/tags/v0.6.3...v0.7.0 Changelog: https://github.com/frenck/python-adguardhome/releases/tag/v0.7.0 --- pkgs/development/python-modules/adguardhome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adguardhome/default.nix b/pkgs/development/python-modules/adguardhome/default.nix index 5dbaefc3db99..564ae172affd 100644 --- a/pkgs/development/python-modules/adguardhome/default.nix +++ b/pkgs/development/python-modules/adguardhome/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "adguardhome"; - version = "0.6.3"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-V8SsWsGYmUhR9/yV6BZBK1UjYGHlDrXrF8nt0eZbTnI="; + hash = "sha256-n55G6ulKcgSSrgPk70D52OO9fp3WURlcRhJQUKrZ1Nk="; }; postPatch = '' From 7af983c4a10f541edc6836fbfb4faa29a9d4d46c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Jun 2024 10:30:35 +0200 Subject: [PATCH 2/2] python312Packages.adguardhome: refactor --- .../python-modules/adguardhome/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/adguardhome/default.nix b/pkgs/development/python-modules/adguardhome/default.nix index 564ae172affd..f7b9d512a34e 100644 --- a/pkgs/development/python-modules/adguardhome/default.nix +++ b/pkgs/development/python-modules/adguardhome/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "adguardhome"; version = "0.7.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.11"; @@ -27,16 +27,13 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "--cov" "" \ - --replace '"0.0.0"' '"${version}"' - - substituteInPlace tests/test_adguardhome.py \ - --replace 0.0.0 ${version} + --replace-fail "--cov" "" \ + --replace-fail '"0.0.0"' '"${version}"' ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp yarl ];