colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #248471 from savyajha/radian-update

Browse Source 
python310Packages.radian: 0.6.5 -> 0.6.6
This commit is contained in:
Fabian Affolter 2023-08-11 18:07:00 +02:00 committed by GitHub
commit 981171662b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/python-modules/radian/default.nix
View File

@ -11,24 +11,29 @@
, prompt-toolkit , prompt-toolkit
, pygments , pygments
, rchitect , rchitect
, six
, R , R
, rPackages , rPackages
, pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "radian"; pname = "radian";
version = "0.6.5"; version = "0.6.6";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "randy3k"; owner = "randy3k";
repo = pname; repo = pname;
rev = "v${version}"; rev = "refs/tags/v${version}";
sha256 = "iuD4EkGZ1GwNxR8Gpg9ANe3lMHJYZ/Q/RyuN6vZZWME="; hash = "sha256-zA7R9UIB0hOWev10Y4oySIKeIxTOo0V6Q3Fxe+FeHSU=";
}; };
postPatch = '' postPatch = ''
substituteInPlace setup.py --replace '"pytest-runner"' "" substituteInPlace setup.py \
--replace '"pytest-runner"' "" \
--replace '0.3.39,<0.4.0' '0.3.39'
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
@ -40,7 +45,6 @@ buildPythonPackage rec {
prompt-toolkit prompt-toolkit
pygments pygments
rchitect rchitect
six
] ++ (with rPackages; [ ] ++ (with rPackages; [
reticulate reticulate
askpass askpass
@ -65,6 +69,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "A 21 century R console"; description = "A 21 century R console";
homepage = "https://github.com/randy3k/radian"; homepage = "https://github.com/randy3k/radian";
changelog = "https://github.com/randy3k/radian/blob/v${version}/CHANGELOG.md";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ savyajha ]; maintainers = with maintainers; [ savyajha ];
}; };

19
pkgs/development/python-modules/rchitect/default.nix
View File

@ -2,25 +2,31 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, cffi , cffi
, six
, pytestCheckHook , pytestCheckHook
, pytest-mock , pytest-mock
, pythonOlder
, R , R
, rPackages }: , rPackages
, six
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "rchitect"; pname = "rchitect";
version = "0.3.40"; version = "0.4.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "randy3k"; owner = "randy3k";
repo = pname; repo = pname;
rev = "v${version}"; rev = "refs/tags/v${version}";
sha256 = "yJMiPmusZ62dd6+5VkA2uSjq57a0C3arG8CgiUUHKpk="; hash = "sha256-fXL2UX0n9kKAVwMUP0z8V3UtJAy4xbAjnPIggUHllN0=";
}; };
postPatch = '' postPatch = ''
substituteInPlace setup.py --replace '"pytest-runner"' "" substituteInPlace setup.py \
--replace '"pytest-runner"' ""
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -46,6 +52,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Interoperate R with Python"; description = "Interoperate R with Python";
homepage = "https://github.com/randy3k/rchitect"; homepage = "https://github.com/randy3k/rchitect";
changelog = "https://github.com/randy3k/rchitect/blob/v${version}/CHANGELOG.md";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ savyajha ]; maintainers = with maintainers; [ savyajha ];
}; };