From 4edade9b68fc31ede2256587ffcef2e11af3614d Mon Sep 17 00:00:00 2001 From: Savyasachee Jha Date: Fri, 11 Aug 2023 11:28:03 +0530 Subject: [PATCH 1/6] python310Packages.rchitect: 0.3.40 -> 0.4.1 --- pkgs/development/python-modules/rchitect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rchitect/default.nix b/pkgs/development/python-modules/rchitect/default.nix index 9e0b1b48d29d..187ff4320f2b 100644 --- a/pkgs/development/python-modules/rchitect/default.nix +++ b/pkgs/development/python-modules/rchitect/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "rchitect"; - version = "0.3.40"; + version = "0.4.1"; src = fetchFromGitHub { owner = "randy3k"; repo = pname; rev = "v${version}"; - sha256 = "yJMiPmusZ62dd6+5VkA2uSjq57a0C3arG8CgiUUHKpk="; + hash = "sha256-fXL2UX0n9kKAVwMUP0z8V3UtJAy4xbAjnPIggUHllN0="; }; postPatch = '' From 48f93c1ec314cbeea4df610d0433472d0fd78e47 Mon Sep 17 00:00:00 2001 From: Savyasachee Jha Date: Fri, 11 Aug 2023 11:28:55 +0530 Subject: [PATCH 2/6] python310Packages.radian: 0.6.5 -> 0.6.6 --- pkgs/development/python-modules/radian/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/radian/default.nix b/pkgs/development/python-modules/radian/default.nix index de60c93f9f8a..bbe7cc36f6ea 100644 --- a/pkgs/development/python-modules/radian/default.nix +++ b/pkgs/development/python-modules/radian/default.nix @@ -18,17 +18,18 @@ buildPythonPackage rec { pname = "radian"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "randy3k"; repo = pname; rev = "v${version}"; - sha256 = "iuD4EkGZ1GwNxR8Gpg9ANe3lMHJYZ/Q/RyuN6vZZWME="; + hash = "sha256-zA7R9UIB0hOWev10Y4oySIKeIxTOo0V6Q3Fxe+FeHSU="; }; postPatch = '' substituteInPlace setup.py --replace '"pytest-runner"' "" + substituteInPlace setup.py --replace '0.3.39,<0.4.0' '0.3.39' ''; nativeBuildInputs = [ From 3f95b4a317fcc1fd761ce9a4034ac451df1a2d2a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Aug 2023 09:30:01 +0200 Subject: [PATCH 3/6] python311Packages.radian: add changelog to meta --- pkgs/development/python-modules/radian/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/radian/default.nix b/pkgs/development/python-modules/radian/default.nix index bbe7cc36f6ea..1d7221d746a0 100644 --- a/pkgs/development/python-modules/radian/default.nix +++ b/pkgs/development/python-modules/radian/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "randy3k"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-zA7R9UIB0hOWev10Y4oySIKeIxTOo0V6Q3Fxe+FeHSU="; }; @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "A 21 century R console"; homepage = "https://github.com/randy3k/radian"; + changelog = "https://github.com/randy3k/radian/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ savyajha ]; }; From 304bb1941e6cc89fc88270f1a9dc05a459d83896 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Aug 2023 09:32:21 +0200 Subject: [PATCH 4/6] python310Packages.rchitect: add changelog to meta --- pkgs/development/python-modules/rchitect/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rchitect/default.nix b/pkgs/development/python-modules/rchitect/default.nix index 187ff4320f2b..d4874f44fad3 100644 --- a/pkgs/development/python-modules/rchitect/default.nix +++ b/pkgs/development/python-modules/rchitect/default.nix @@ -6,7 +6,8 @@ , pytestCheckHook , pytest-mock , R -, rPackages }: +, rPackages +}: buildPythonPackage rec { pname = "rchitect"; @@ -15,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "randy3k"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-fXL2UX0n9kKAVwMUP0z8V3UtJAy4xbAjnPIggUHllN0="; }; @@ -46,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Interoperate R with Python"; homepage = "https://github.com/randy3k/rchitect"; + changelog = "https://github.com/randy3k/rchitect/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ savyajha ]; }; From 646abd9aac905c6d0a4d042bda26ad90eda49bf7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Aug 2023 09:49:44 +0200 Subject: [PATCH 5/6] python311Packages.radian: add format - disable on unsupported Python releases --- pkgs/development/python-modules/radian/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/radian/default.nix b/pkgs/development/python-modules/radian/default.nix index 1d7221d746a0..d8ffc2bff9ef 100644 --- a/pkgs/development/python-modules/radian/default.nix +++ b/pkgs/development/python-modules/radian/default.nix @@ -11,14 +11,17 @@ , prompt-toolkit , pygments , rchitect -, six , R , rPackages +, pythonOlder }: buildPythonPackage rec { pname = "radian"; version = "0.6.6"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "randy3k"; @@ -28,8 +31,9 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace setup.py --replace '"pytest-runner"' "" - substituteInPlace setup.py --replace '0.3.39,<0.4.0' '0.3.39' + substituteInPlace setup.py \ + --replace '"pytest-runner"' "" \ + --replace '0.3.39,<0.4.0' '0.3.39' ''; nativeBuildInputs = [ @@ -41,7 +45,6 @@ buildPythonPackage rec { prompt-toolkit pygments rchitect - six ] ++ (with rPackages; [ reticulate askpass From 2cf03e242774cf806f82cada2d89ec5fe369813a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Aug 2023 09:50:29 +0200 Subject: [PATCH 6/6] python311Packages.rchitect: add format - disable on unsupported Python releases --- pkgs/development/python-modules/rchitect/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rchitect/default.nix b/pkgs/development/python-modules/rchitect/default.nix index d4874f44fad3..ad1484dfc254 100644 --- a/pkgs/development/python-modules/rchitect/default.nix +++ b/pkgs/development/python-modules/rchitect/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchFromGitHub , cffi -, six , pytestCheckHook , pytest-mock +, pythonOlder , R , rPackages +, six }: buildPythonPackage rec { pname = "rchitect"; version = "0.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "randy3k"; @@ -21,7 +25,8 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace setup.py --replace '"pytest-runner"' "" + substituteInPlace setup.py \ + --replace '"pytest-runner"' "" ''; propagatedBuildInputs = [