Unverified Commit eb212d9f authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

python3Packages.radian: convert to application (#403632)

parents 645c320e a244d161

pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -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";

pkgs/development/python-modules/radian/default.nix→pkgs/by-name/ra/radian/package.nix

+14 −27
Original line number Diff line number Diff line 
{

  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 = [

  nativeCheckInputs =

    (with python3Packages; [

      pytestCheckHook

      pyte

      pexpect

      ptyprocess

      jedi

    git

  ];

    ])

    ++ [ git ];



  makeWrapperArgs = [ "--set R_HOME ${R}/lib/R" ];

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -10134,7 +10134,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

pkgs/top-level/python-aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -667,6 +667,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

pkgs/top-level/python-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -15004,8 +15004,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; };















  };