diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-27 08:21:50 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-27 08:21:50 +0200 |
| commit | 79452954109ad29f0c9c24f794bfe88a12d538cb (patch) | |
| tree | 45443f511b8837a0457456fd3fcc3c97437d05e3 /pkgs/applications/science | |
| parent | 0e530b037d50985107899c94104175df629e8544 (diff) | |
| parent | 87e44b0357ce7a43517e5faf17f22551181802bd (diff) | |
| download | nixlib-79452954109ad29f0c9c24f794bfe88a12d538cb.tar nixlib-79452954109ad29f0c9c24f794bfe88a12d538cb.tar.gz nixlib-79452954109ad29f0c9c24f794bfe88a12d538cb.tar.bz2 nixlib-79452954109ad29f0c9c24f794bfe88a12d538cb.tar.lz nixlib-79452954109ad29f0c9c24f794bfe88a12d538cb.tar.xz nixlib-79452954109ad29f0c9c24f794bfe88a12d538cb.tar.zst nixlib-79452954109ad29f0c9c24f794bfe88a12d538cb.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/math/sage/sage-src.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 096f2212cc49..7fd49fe205cc 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -136,6 +136,13 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/patch?id2=8.4.beta0&id=8bef4fd2876a61969b516fe4eb3b8ad7cc076c5e"; sha256 = "00p3hfsfn3w2vxgd9fjd23mz7xfxjfravf8ysjxkyd657jbkpjmk"; }) + + # https://trac.sagemath.org/ticket/26117 + (fetchpatch { + name = "sympy-1.2.patch"; + url = "https://git.sagemath.org/sage.git/patch?id2=8.4.beta2&id=d94a0a3a3fb4aec05a6f4d95166d90c284f05c36"; + sha256 = "0an2xl1pp3jg36kgg2m1vb7sns7rprk1h3d0qy1gxwdab6i7qnvi"; + }) ]; patches = nixPatches ++ packageUpgradePatches ++ [ |