From d5b29d1ea167ba26cbd6ee64b12801b720e704cb Mon Sep 17 00:00:00 2001 From: Bruno Rodrigues Date: Fri, 13 Sep 2024 15:49:58 +0200 Subject: [PATCH 1/2] python312Packages.radian: 0.6.12 -> 0.6.13 --- .../python-modules/radian/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/radian/default.nix b/pkgs/development/python-modules/radian/default.nix index fd185ac7be4b..e42e16f307c2 100644 --- a/pkgs/development/python-modules/radian/default.nix +++ b/pkgs/development/python-modules/radian/default.nix @@ -6,6 +6,7 @@ pyte, pexpect, ptyprocess, + pythonOlder, jedi, git, lineedit, @@ -14,21 +15,22 @@ rchitect, R, rPackages, - pythonOlder, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "radian"; - version = "0.6.12"; - format = "setuptools"; + version = "0.6.13"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "randy3k"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cojKbDNqcUay5RxvWszQ96eC4jVI4G7iRv/ZYWgidCQ="; + hash = "sha256-gz2VczAgVbvISzvY/v0GvZ/Erv6ipZwPU61r6OJ+3Fo="; }; postPatch = '' @@ -36,6 +38,11 @@ buildPythonPackage rec { --replace '"pytest-runner"' "" ''; + build-system = [ + setuptools + setuptools-scm + ]; + nativeBuildInputs = [ R # needed at setup time to detect R_HOME ]; From d1e5bbc756535966e3047e61c45b65137d0ffe9a Mon Sep 17 00:00:00 2001 From: Bruno Rodrigues Date: Fri, 13 Sep 2024 15:50:07 +0200 Subject: [PATCH 2/2] python312Packages.rchitect: 0.4.6 -> 0.4.7 --- .../python-modules/rchitect/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/rchitect/default.nix b/pkgs/development/python-modules/rchitect/default.nix index dc2f22e97194..785b0218d9f2 100644 --- a/pkgs/development/python-modules/rchitect/default.nix +++ b/pkgs/development/python-modules/rchitect/default.nix @@ -3,27 +3,29 @@ buildPythonPackage, fetchFromGitHub, cffi, + packaging, pytestCheckHook, pytest-mock, pythonOlder, R, rPackages, + setuptools, + setuptools-scm, six, - packaging, }: buildPythonPackage rec { pname = "rchitect"; - version = "0.4.6"; - format = "setuptools"; + version = "0.4.7"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "randy3k"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IVyYzf433m03RRfL5SmUOdaXFy0NHf/QuAdtUeUjIz0="; + hash = "sha256-M7OWDo3mEEOYtjIpzPIpzPMBtv2TZJKJkSfHczZYS8Y="; }; postPatch = '' @@ -31,6 +33,11 @@ buildPythonPackage rec { --replace '"pytest-runner"' "" ''; + build-system = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ cffi six