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

Merge pull request #51191 from timokau/sage-fixes

Browse Source 
sage: fix test timeout and downgraded R tests
This commit is contained in:
Timo Kaufmann 2018-11-28 23:10:32 +01:00 committed by GitHub
commit aa053197de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/science/math/sage/default.nix
View File

@ -129,6 +129,7 @@ let
# https://trac.sagemath.org/ticket/25674 # https://trac.sagemath.org/ticket/25674
R = pkgs.R.overrideAttrs (attrs: rec { R = pkgs.R.overrideAttrs (attrs: rec {
name = "R-3.4.4"; name = "R-3.4.4";
doCheck = false;
src = fetchurl { src = fetchurl {
url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
sha256 = "0dq3jsnwsb5j3fhl0wi3p5ycv8avf8s5j1y4ap3d2mkjmcppvsdk"; sha256 = "0dq3jsnwsb5j3fhl0wi3p5ycv8avf8s5j1y4ap3d2mkjmcppvsdk";

2
pkgs/applications/science/math/sage/sage-tests.nix
View File

@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
mkdir -p "$HOME" mkdir -p "$HOME"
# "--long" tests are in the order of 1h, without "--long" its 1/2h # "--long" tests are in the order of 1h, without "--long" its 1/2h
"sage" -t --nthreads "$NIX_BUILD_CORES" --optional=sage ${patienceSpecifier} ${testArgs} "sage" -t --timeout=0 --nthreads "$NIX_BUILD_CORES" --optional=sage ${patienceSpecifier} ${testArgs}
''; '';
} }