From 0e4160a3a11d67a66ba9bc556a6d6d4ee3af9c0e Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 26 Aug 2018 19:56:08 +0200
Subject: pythonPackages.sympy: 1.1.1 -> 1.2

---
 pkgs/development/python-modules/sympy/default.nix | 26 ++++++++---------------
 1 file changed, 9 insertions(+), 17 deletions(-)

(limited to 'pkgs/development/python-modules/sympy')

diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix
index f41f2e7b4fa1f..fb702e046a48a 100644
--- a/pkgs/development/python-modules/sympy/default.nix
+++ b/pkgs/development/python-modules/sympy/default.nix
@@ -8,44 +8,36 @@
 
 buildPythonPackage rec {
   pname = "sympy";
-  version = "1.1.1";
+  version = "1.2"; # Upgrades may break sage. Please test.
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ac5b57691bc43919dcc21167660a57cc51797c28a4301a6144eff07b751216a4";
+    sha256 = "0pr2v7dl51ngch1cfs423qsb472l9ys1m8m7vrhhh99fsxqa0v18";
   };
 
   checkInputs = [ glibcLocales ];
 
   propagatedBuildInputs = [ mpmath ];
 
-  # Bunch of failures including transients.
+  # some tests fail: https://github.com/sympy/sympy/issues/15149
   doCheck = false;
 
-  preCheck = ''
-    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).
+    # to be fixed by https://github.com/sympy/sympy/pull/13476
     (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";
-    })
   ];
 
+  preCheck = ''
+    export LANG="en_US.UTF-8"
+  '';
+
   meta = {
     description = "A Python library for symbolic mathematics";
     homepage    = http://www.sympy.org/;
     license     = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ lovek323 ];
+    maintainers = with lib.maintainers; [ lovek323 timokau ];
   };
 }
-- 
cgit 1.4.1