diff options
| author | Mauricio Collares <mauricio@collares.org> | 2023-10-20 18:50:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-20 18:50:24 +0200 |
| commit | af038be354d32b1b415b50cde7e7c7534db9cb1c (patch) | |
| tree | fab62243467b77b9d4e41f74c7643762a93c32f6 /pkgs | |
| parent | b94fdc247079d16dd19048768da1b2a209222fdb (diff) | |
| parent | cff2c0d2ccca7ed6546f21e461c48a817f8fce5f (diff) | |
| download | nixlib-af038be354d32b1b415b50cde7e7c7534db9cb1c.tar nixlib-af038be354d32b1b415b50cde7e7c7534db9cb1c.tar.gz nixlib-af038be354d32b1b415b50cde7e7c7534db9cb1c.tar.bz2 nixlib-af038be354d32b1b415b50cde7e7c7534db9cb1c.tar.lz nixlib-af038be354d32b1b415b50cde7e7c7534db9cb1c.tar.xz nixlib-af038be354d32b1b415b50cde7e7c7534db9cb1c.tar.zst nixlib-af038be354d32b1b415b50cde7e7c7534db9cb1c.zip | |
Merge pull request #262290 from collares/sage-matplotlib-3.8
[staging-next] sage, rpy2: test fixes
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/math/sage/sage-src.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/science/math/sage/sagelib.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/python-modules/rpy2/default.nix | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 9fe07603fe7d..8064a965bd1f 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -110,6 +110,13 @@ stdenv.mkDerivation rec { url = "https://github.com/sagemath/sage/commit/d88bc3815c0901bfdeaa3e4a31107c084199f614.diff"; sha256 = "sha256-dXaEwk2wXxmx02sCw4Vu9mF0ZrydhFD4LRwNAiQsPgM="; }) + + # https://github.com/sagemath/sage/pull/36279, landed in 10.2.beta4 + (fetchpatch { + name = "matplotlib-3.8-upgrade.patch"; + url = "https://github.com/sagemath/sage/commit/0fcf88935908440930c5f79202155aca4ad57518.diff"; + sha256 = "sha256-mvqAHaTCXsxPv901L8HSTnrfghfXYdq0wfLoP/cYQZI="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index d8d5586e2193..f8beabaac1ff 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -78,6 +78,7 @@ , sphinx , sympy , typing-extensions +, nbclassic }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -181,6 +182,8 @@ buildPythonPackage rec { sphinx sympy typing-extensions + + nbclassic ]; preBuild = '' diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index 4d0e19f513a8..837d77b4dce2 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -81,6 +81,10 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; + # newlines in environment variables are a problem due to + # https://github.com/rpy2/rpy2/issues/1066 + preCheck = "unset postPatch"; + nativeCheckInputs = [ pytestCheckHook ]; |