diff options
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/logic/lean/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/math/sage/patches/sympy-1.7-update.patch | 25 | ||||
| -rw-r--r-- | pkgs/applications/science/math/sage/sage-src.nix | 3 |
3 files changed, 30 insertions, 2 deletions
diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 88e1b4fbc0e..0684abd5ab3 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.23.0"; + version = "3.24.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "09mklc1p6ms1jayg2f89hqfmhca3h5744lli936l38ypn1d00sxx"; + sha256 = "npzBuZ37KrUYwC0TglryVTqui/3/t1ma1Zjpnty0d7c="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/math/sage/patches/sympy-1.7-update.patch b/pkgs/applications/science/math/sage/patches/sympy-1.7-update.patch new file mode 100644 index 00000000000..1d21622a235 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/sympy-1.7-update.patch @@ -0,0 +1,25 @@ +diff --git a/src/sage/interfaces/sympy.py b/src/sage/interfaces/sympy.py +index cc35a42a9f..6e577d5d8d 100644 +--- a/src/sage/interfaces/sympy.py ++++ b/src/sage/interfaces/sympy.py +@@ -397,7 +397,7 @@ def _sympysage_rf(self): + sage: from sympy import Symbol, rf + sage: _ = var('x, y') + sage: rfxy = rf(Symbol('x'), Symbol('y')) +- sage: assert rising_factorial(x,y)._sympy_() == rfxy.rewrite('gamma') ++ sage: assert rising_factorial(x,y)._sympy_() == rfxy.rewrite('gamma', piecewise=False) + sage: assert rising_factorial(x,y) == rfxy._sage_() + """ + from sage.arith.all import rising_factorial +diff --git a/src/sage/symbolic/expression.pyx b/src/sage/symbolic/expression.pyx +index 7c18ec1efa..c2619ac42d 100644 +--- a/src/sage/symbolic/expression.pyx ++++ b/src/sage/symbolic/expression.pyx +@@ -955,6 +955,6 @@ cdef class Expression(CommutativeRingElement): + sage: unicode_art(13 - I) + 13 - ⅈ + sage: unicode_art(1.3 - I) +- 1.3 - 1.0⋅ⅈ ++ 1.3 - ⅈ + sage: unicode_art(cos(I)) + cosh(1) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 8948621a025..b8fb4159660 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -103,6 +103,9 @@ stdenv.mkDerivation rec { # adapt sage's Image class to pillow 8.0.1 (https://trac.sagemath.org/ticket/30971) ./patches/pillow-update.patch + + # fix test output with sympy 1.7 (https://trac.sagemath.org/ticket/30985) + ./patches/sympy-1.7-update.patch ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; |