summary refs log tree commit diff
diff options
context:
space:
mode:
authorTimo Kaufmann <timokau@zoho.com>2018-05-07 23:45:02 +0200
committerTimo Kaufmann <timokau@zoho.com>2018-06-30 01:20:46 +0200
commita0eace3be6a182f11305ab00c0feca8c385c6d0c (patch)
tree76c8f5c66505461c3376ee9c2e152799f79fbd55
parent424835acc87112d114944a529bdea27f2fb24843 (diff)
downloadnixlib-a0eace3be6a182f11305ab00c0feca8c385c6d0c.tar
nixlib-a0eace3be6a182f11305ab00c0feca8c385c6d0c.tar.gz
nixlib-a0eace3be6a182f11305ab00c0feca8c385c6d0c.tar.bz2
nixlib-a0eace3be6a182f11305ab00c0feca8c385c6d0c.tar.lz
nixlib-a0eace3be6a182f11305ab00c0feca8c385c6d0c.tar.xz
nixlib-a0eace3be6a182f11305ab00c0feca8c385c6d0c.tar.zst
nixlib-a0eace3be6a182f11305ab00c0feca8c385c6d0c.zip
sympy: backport upstream fixes
-rw-r--r--pkgs/development/python-modules/sympy/default.nix19
1 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix
index 67c799e554eb..f41f2e7b4fa1 100644
--- a/pkgs/development/python-modules/sympy/default.nix
+++ b/pkgs/development/python-modules/sympy/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , glibcLocales
 , mpmath
 }:
@@ -25,10 +26,26 @@ buildPythonPackage rec {
     export LANG="en_US.UTF-8"
   '';
 
+  patches = [
+    # see https://trac.sagemath.org/ticket/20204 and https://github.com/sympy/sympy/issues/12825
+    # There is also an upstream patch for this, included in the next release (PR #128826).
+    # However that doesn't quite fix the issue yet. Apparently some changes by sage are required.
+    # TODO re-evaluate the change once a new sympy version is released (open a sage trac ticket about
+    # it).
+    (fetchpatch {
+      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympy/patches/03_undeffun_sage.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+      sha256 = "1mh2va1rlgizgvx8yzqwgvbf5wvswarn511002b361mc8yy0bnhr";
+    })
+    (fetchpatch {
+      url = "https://github.com/sympy/sympy/pull/13276.patch";
+      sha256 = "1rz74b5c74vwh3pj9axxgh610i02l3555vvsvr4a15ya7siw7zxh";
+    })
+  ];
+
   meta = {
     description = "A Python library for symbolic mathematics";
     homepage    = http://www.sympy.org/;
     license     = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ lovek323 ];
   };
-}
\ No newline at end of file
+}