From 6109e565e2ce3ba87d5145719e1763b46b7452bd Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 29 Jun 2026 10:24:05 +0300 Subject: [PATCH 1/4] python3Packages.pwlf: remove unneeded wheel native input --- pkgs/development/python-modules/pwlf/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/pwlf/default.nix b/pkgs/development/python-modules/pwlf/default.nix index 43d1c65594b4..71f7648401f3 100644 --- a/pkgs/development/python-modules/pwlf/default.nix +++ b/pkgs/development/python-modules/pwlf/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, setuptools, - wheel, scipy, numpy, pydoe, @@ -24,7 +23,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ From 2bee88c4fb362e88cfb61048b9c54014250c9534 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 29 Jun 2026 10:24:24 +0300 Subject: [PATCH 2/4] python3Packages.pwlf: use finalAttrs pattern --- pkgs/development/python-modules/pwlf/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pwlf/default.nix b/pkgs/development/python-modules/pwlf/default.nix index 71f7648401f3..af32fa29c70b 100644 --- a/pkgs/development/python-modules/pwlf/default.nix +++ b/pkgs/development/python-modules/pwlf/default.nix @@ -9,7 +9,7 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pwlf"; version = "2.5.2"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cjekel"; repo = "piecewise_linear_fit_py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gN4AOmtezJ1310TVcKLsJ6rOtv0rGkQ6LjVluIeYEGQ="; }; @@ -38,8 +38,8 @@ buildPythonPackage rec { meta = { description = "Fit piecewise linear data for a specified number of line segments"; homepage = "https://jekel.me/piecewise_linear_fit_py/"; - changelog = "https://github.com/cjekel/piecewise_linear_fit_py/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/cjekel/piecewise_linear_fit_py/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ doronbehar ]; }; -} +}) From 9196e24949eb0cb3b7df5f9f2324aab0de07e0ca Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 29 Jun 2026 10:25:30 +0300 Subject: [PATCH 3/4] python3Packages.pwlf: modernize buildPythonPackage arguments --- pkgs/development/python-modules/pwlf/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pwlf/default.nix b/pkgs/development/python-modules/pwlf/default.nix index af32fa29c70b..36c4e5c86336 100644 --- a/pkgs/development/python-modules/pwlf/default.nix +++ b/pkgs/development/python-modules/pwlf/default.nix @@ -2,10 +2,16 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, + + # dependencies scipy, numpy, pydoe, + + # tests unittestCheckHook, }: @@ -21,11 +27,11 @@ buildPythonPackage (finalAttrs: { hash = "sha256-gN4AOmtezJ1310TVcKLsJ6rOtv0rGkQ6LjVluIeYEGQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ scipy numpy pydoe From dc11e8667622c68d7119da226d437f51df8e8ba6 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 29 Jun 2026 10:25:59 +0300 Subject: [PATCH 4/4] python3Packages.pwlf: 2.5.2 -> 2.5.3 Diff: https://github.com/cjekel/piecewise_linear_fit_py/compare/v2.5.2...v2.5.3 Changelog: https://github.com/cjekel/piecewise_linear_fit_py/blob/v2.5.3/CHANGELOG.md --- pkgs/development/python-modules/pwlf/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pwlf/default.nix b/pkgs/development/python-modules/pwlf/default.nix index 36c4e5c86336..133679bc945f 100644 --- a/pkgs/development/python-modules/pwlf/default.nix +++ b/pkgs/development/python-modules/pwlf/default.nix @@ -17,14 +17,14 @@ buildPythonPackage (finalAttrs: { pname = "pwlf"; - version = "2.5.2"; + version = "2.5.3"; pyproject = true; src = fetchFromGitHub { owner = "cjekel"; repo = "piecewise_linear_fit_py"; tag = "v${finalAttrs.version}"; - hash = "sha256-gN4AOmtezJ1310TVcKLsJ6rOtv0rGkQ6LjVluIeYEGQ="; + hash = "sha256-En8zgImub4hMVphl7c0OkdQJ1LRTEBw0kI8dSs4V+N8="; }; build-system = [ @@ -47,5 +47,7 @@ buildPythonPackage (finalAttrs: { changelog = "https://github.com/cjekel/piecewise_linear_fit_py/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ doronbehar ]; + # See https://github.com/cjekel/piecewise_linear_fit_py/issues/134 + broken = lib.versionAtLeast scipy.version "1.18"; }; })