From d4394b0197421fc818615ad3aad21792f3eb70d1 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 6 Jun 2026 01:55:15 +0700 Subject: [PATCH 1/2] python3Packages.bch: migrate to pyproject --- pkgs/development/python-modules/bch/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bch/default.nix b/pkgs/development/python-modules/bch/default.nix index c2f529fddee3..9f39521f3327 100644 --- a/pkgs/development/python-modules/bch/default.nix +++ b/pkgs/development/python-modules/bch/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, click, click-log, paho-mqtt, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "bch"; version = "1.2.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "hardwario"; @@ -20,7 +21,9 @@ buildPythonPackage rec { sha256 = "/C+NbJ0RrWZ/scv/FiRBTh4h7u0xS4mHVDWQ0WwmlEY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ click click-log paho-mqtt From bbd7e87d3b1d811cc39bfcf34e1ca886ab39c94a Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 6 Jun 2026 02:03:27 +0700 Subject: [PATCH 2/2] python3Packages.bch: modernize --- pkgs/development/python-modules/bch/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/bch/default.nix b/pkgs/development/python-modules/bch/default.nix index 9f39521f3327..c947beafd19b 100644 --- a/pkgs/development/python-modules/bch/default.nix +++ b/pkgs/development/python-modules/bch/default.nix @@ -9,16 +9,18 @@ pyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bch"; version = "1.2.1"; pyproject = true; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "hardwario"; repo = "bch-control-tool"; - rev = "v${version}"; - sha256 = "/C+NbJ0RrWZ/scv/FiRBTh4h7u0xS4mHVDWQ0WwmlEY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/C+NbJ0RrWZ/scv/FiRBTh4h7u0xS4mHVDWQ0WwmlEY="; }; build-system = [ setuptools ]; @@ -31,8 +33,8 @@ buildPythonPackage rec { ]; postPatch = '' - sed -ri 's/@@VERSION@@/${version}/g' \ - bch/cli.py setup.py + substituteInPlace bch/cli.py setup.py \ + --replace-fail "@@VERSION@@" "${finalAttrs.version}" ''; pythonImportsCheck = [ "bch" ]; @@ -45,4 +47,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ cynerd ]; }; -} +})