python3Packages.radian: convert to application
Radian is not used as a library, so it should be built using `buildPythonApplication` and should be promoted to a top-level attribute. Update pkgs/top-level/all-packages.nix Co-authored-by: Gavin John <gavinnjohn@gmail.com>
This commit is contained in:
co-authored by
Gavin John
parent
1bcbf9e0a8
commit
a244d161ff
@@ -3,9 +3,9 @@
|
||||
vscode-utils,
|
||||
jq,
|
||||
moreutils,
|
||||
python311Packages,
|
||||
R,
|
||||
rPackages,
|
||||
radian,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
@@ -20,7 +20,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
moreutils
|
||||
];
|
||||
buildInputs = [
|
||||
python311Packages.radian
|
||||
radian
|
||||
R
|
||||
rPackages.languageserver
|
||||
];
|
||||
@@ -28,8 +28,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."r.rpath.mac".default = "${lib.getExe' R "R"}"' package.json | sponge package.json
|
||||
jq '.contributes.configuration.properties."r.rpath.linux".default = "${lib.getExe' R "R"}"' package.json | sponge package.json
|
||||
jq '.contributes.configuration.properties."r.rterm.mac".default = "${lib.getExe python311Packages.radian}"' package.json | sponge package.json
|
||||
jq '.contributes.configuration.properties."r.rterm.linux".default = "${lib.getExe python311Packages.radian}"' package.json | sponge package.json
|
||||
jq '.contributes.configuration.properties."r.rterm.mac".default = "${lib.getExe radian}"' package.json | sponge package.json
|
||||
jq '.contributes.configuration.properties."r.rterm.linux".default = "${lib.getExe radian}"' package.json | sponge package.json
|
||||
'';
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/REditorSupport.r/changelog";
|
||||
|
||||
+14
-27
@@ -1,31 +1,17 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
pyte,
|
||||
pexpect,
|
||||
ptyprocess,
|
||||
pythonOlder,
|
||||
jedi,
|
||||
git,
|
||||
lineedit,
|
||||
prompt-toolkit,
|
||||
pygments,
|
||||
rchitect,
|
||||
R,
|
||||
rPackages,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "radian";
|
||||
version = "0.6.13";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "randy3k";
|
||||
repo = "radian";
|
||||
@@ -38,7 +24,7 @@ buildPythonPackage rec {
|
||||
--replace '"pytest-runner"' ""
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
@@ -48,25 +34,26 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs =
|
||||
[
|
||||
(with python3Packages; [
|
||||
lineedit
|
||||
prompt-toolkit
|
||||
pygments
|
||||
rchitect
|
||||
]
|
||||
])
|
||||
++ (with rPackages; [
|
||||
reticulate
|
||||
askpass
|
||||
]);
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pyte
|
||||
pexpect
|
||||
ptyprocess
|
||||
jedi
|
||||
git
|
||||
];
|
||||
nativeCheckInputs =
|
||||
(with python3Packages; [
|
||||
pytestCheckHook
|
||||
pyte
|
||||
pexpect
|
||||
ptyprocess
|
||||
jedi
|
||||
])
|
||||
++ [ git ];
|
||||
|
||||
makeWrapperArgs = [ "--set R_HOME ${R}/lib/R" ];
|
||||
|
||||
@@ -10175,7 +10175,6 @@ with pkgs;
|
||||
spatial
|
||||
survival
|
||||
];
|
||||
radian = python3Packages.radian;
|
||||
# Override this attribute to register additional libraries.
|
||||
packages = [ ];
|
||||
# Override this attribute if you want to expose R with the same set of
|
||||
|
||||
@@ -665,6 +665,7 @@ mapAliases ({
|
||||
qcodes-loop = throw "qcodes-loop has been removed due to deprecation"; # added 2023-11-30
|
||||
qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages";
|
||||
rabbitpy = throw "rabbitpy has been removed, since it is unmaintained and broken"; # added 2023-07-01
|
||||
radian = throw "radian has been promoted to a top-level attribute name: `pkgs.radian`"; # added 2025-05-02
|
||||
radicale_infcloud = radicale-infcloud; # added 2024-01-07
|
||||
radio_beam = radio-beam; # added 2023-11-04
|
||||
ratelimiter = throw "ratelimiter has been removed, since it is unmaintained and broken"; # added 2023-10-21
|
||||
|
||||
@@ -14844,8 +14844,6 @@ self: super: with self; {
|
||||
|
||||
rachiopy = callPackage ../development/python-modules/rachiopy { };
|
||||
|
||||
radian = callPackage ../development/python-modules/radian { };
|
||||
|
||||
radicale-infcloud = callPackage ../development/python-modules/radicale-infcloud {
|
||||
radicale = pkgs.radicale.override { python3 = python; };
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user