diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2018-11-28 23:10:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-28 23:10:32 +0100 |
| commit | aa053197deb846e9cfedb6f7e80330efd3e4c54b (patch) | |
| tree | f7409556a49a6bc92d5040ebeaa3399be5bf5f77 | |
| parent | 6a0f0cce63b65e41ab679cc66a20f9acfc0d61c3 (diff) | |
| parent | d6376bca6de2014705492ed70c93054b74540523 (diff) | |
| download | nixlib-aa053197deb846e9cfedb6f7e80330efd3e4c54b.tar nixlib-aa053197deb846e9cfedb6f7e80330efd3e4c54b.tar.gz nixlib-aa053197deb846e9cfedb6f7e80330efd3e4c54b.tar.bz2 nixlib-aa053197deb846e9cfedb6f7e80330efd3e4c54b.tar.lz nixlib-aa053197deb846e9cfedb6f7e80330efd3e4c54b.tar.xz nixlib-aa053197deb846e9cfedb6f7e80330efd3e4c54b.tar.zst nixlib-aa053197deb846e9cfedb6f7e80330efd3e4c54b.zip | |
Merge pull request #51191 from timokau/sage-fixes
sage: fix test timeout and downgraded R tests
| -rw-r--r-- | pkgs/applications/science/math/sage/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/science/math/sage/sage-tests.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 832b2f110565..46e60a2b81e4 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -129,6 +129,7 @@ let # https://trac.sagemath.org/ticket/25674 R = pkgs.R.overrideAttrs (attrs: rec { name = "R-3.4.4"; + doCheck = false; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; sha256 = "0dq3jsnwsb5j3fhl0wi3p5ycv8avf8s5j1y4ap3d2mkjmcppvsdk"; diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix index feccf75a7acb..1f400db18fcb 100644 --- a/pkgs/applications/science/math/sage/sage-tests.nix +++ b/pkgs/applications/science/math/sage/sage-tests.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { mkdir -p "$HOME" # "--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} ''; } |