Unverified Commit ab2bfe62 authored by Justin Bedő's avatar Justin Bedő Committed by GitHub
Browse files

Merge pull request #250574 from savyajha/radian-update 

python310Packages.radian: 0.6.6 -> 0.6.7
parents 05b5879b 953b2d70

pkgs/development/python-modules/radian/default.nix

+5 −4
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


buildPythonPackage rec {

  pname = "radian";

  version = "0.6.6";

  version = "0.6.7";

  format = "setuptools";



  disabled = pythonOlder "3.6";
@@ -27,13 +27,12 @@ buildPythonPackage rec { 
    owner = "randy3k";

    repo = pname;

    rev = "refs/tags/v${version}";

    hash = "sha256-zA7R9UIB0hOWev10Y4oySIKeIxTOo0V6Q3Fxe+FeHSU=";

    hash = "sha256-MEstbQj1dOcrukgDvMwL330L9INEZcIupebrSYMOrZk=";

  };



  postPatch = ''

    substituteInPlace setup.py \

      --replace '"pytest-runner"' "" \

      --replace '0.3.39,<0.4.0' '0.3.39'

      --replace '"pytest-runner"' ""

  '';



  nativeBuildInputs = [
@@ -59,6 +58,8 @@ buildPythonPackage rec { 
    git

  ];



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



  preCheck = ''

    export HOME=$TMPDIR

    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${R}/lib/R/lib

pkgs/development/r-modules/wrapper-radian.nix

+1 −2
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ runCommand (radian.name + "-wrapper") { 
  };

} (''

  makeWrapper "${radian}/bin/radian" "$out/bin/radian" \

    --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" \

    --set "R_HOME" "${R}/lib/R"

    --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE"

'' + lib.optionalString wrapR ''

  cd ${R}/bin

  for exe in *; do