From 37658152704ed165f3b3bca8ec65d736434062a8 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 17 Jul 2025 09:40:53 +0300 Subject: [PATCH 1/2] python312Packages.curvefitgui: modernize format --- .../python-modules/curvefitgui/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/curvefitgui/default.nix b/pkgs/development/python-modules/curvefitgui/default.nix index 5c5f2247e553..1769f095acb3 100644 --- a/pkgs/development/python-modules/curvefitgui/default.nix +++ b/pkgs/development/python-modules/curvefitgui/default.nix @@ -2,8 +2,12 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, pythonAtLeast, + + # build-system + setuptools, + + # depedencies numpy, scipy, pyqt5, @@ -27,9 +31,11 @@ buildPythonPackage { hash = "sha256-oK0ROKxh/91OrHhuufG6pvc2EMBeMP8R5O+ED2thyW8="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + ]; - propagatedBuildInputs = [ + dependencies = [ numpy scipy pyqt5 From c2e648389087f4a114400f3335bfed2af73ff138 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 17 Jul 2025 09:46:39 +0300 Subject: [PATCH 2/2] python312Packages.curvefitgui: enable The problem reported upstream has gone naturally, due to changes in PyQt5 that have reached Nixpkgs too. --- pkgs/development/python-modules/curvefitgui/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/python-modules/curvefitgui/default.nix b/pkgs/development/python-modules/curvefitgui/default.nix index 1769f095acb3..29502f64e95c 100644 --- a/pkgs/development/python-modules/curvefitgui/default.nix +++ b/pkgs/development/python-modules/curvefitgui/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonAtLeast, # build-system setuptools, @@ -18,11 +17,6 @@ buildPythonPackage { pname = "curvefitgui"; version = "0-unstable-2021-08-25"; pyproject = true; - # For some reason, importing the main module makes the whole python - # interpreter crash! This needs further investigation, possibly the problem - # is with one of the dependencies.. See upstream report: - # https://github.com/moosepy/curvefitgui/issues/2 - disabled = pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "moosepy";