diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2019-12-26 13:12:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-26 13:12:21 +0100 |
| commit | 98e6a8b5792b960c9f21b8836421b02f1ccdccfd (patch) | |
| tree | 0302e61d21b8c95ffa7ce69e748f05fe271dbbd7 /pkgs | |
| parent | b0bbacb52134a7e731e549f4c0a7a2a39ca6b481 (diff) | |
| parent | 8ac53ed0b17aaa55c37adf51814e262e8ce83d00 (diff) | |
| download | nixpkgs-98e6a8b5792b960c9f21b8836421b02f1ccdccfd.tar nixpkgs-98e6a8b5792b960c9f21b8836421b02f1ccdccfd.tar.gz nixpkgs-98e6a8b5792b960c9f21b8836421b02f1ccdccfd.tar.bz2 nixpkgs-98e6a8b5792b960c9f21b8836421b02f1ccdccfd.tar.lz nixpkgs-98e6a8b5792b960c9f21b8836421b02f1ccdccfd.tar.xz nixpkgs-98e6a8b5792b960c9f21b8836421b02f1ccdccfd.tar.zst nixpkgs-98e6a8b5792b960c9f21b8836421b02f1ccdccfd.zip | |
Merge pull request #76531 from timokau/sympy-1.5
python.pkgs.sympy: 1.4 -> 1.5
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/math/sage/sage-src.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/python-modules/sympy/default.nix | 12 |
2 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index dc8ba48e45e..4530cbf69f4 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -118,6 +118,13 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/patch?id=fcc11d6effa39f375bc5f4ea5831fb7a2f2767da"; sha256 = "0hnmc8ld3bblks0hcjvjjaydkgwdr1cs3dbl2ys4gfq964pjgqwc"; }) + + # https://trac.sagemath.org/ticket/28911 + (fetchpatch { + name = "sympy-1.5.patch"; + url = "https://git.sagemath.org/sage.git/patch/?h=c6d0308db15efd611211d26cfcbefbd180fc0831"; + sha256 = "0nwai2jr22h49km4hx3kwafs3mzsc5kwsv7mqwjf6ibwfx2bbgyq"; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index c09267662c1..87ef13bba0f 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.4"; # Upgrades may break sage. Please test or ping @timokau. + version = "1.5"; # Upgrades may break sage. Please test or ping @timokau. src = fetchPypi { inherit pname version; - sha256 = "1q937csy8rd18pk2fz1ssj7jyj7l3rjx4nzbiz5vcymfhrb1x8bi"; + sha256 = "1s4w7q8gndim2ky825a84jmwcf7ryfn10wm8yxz9dw5z2307smii"; }; checkInputs = [ glibcLocales ]; @@ -22,14 +22,6 @@ buildPythonPackage rec { # tests take ~1h doCheck = false; - patches = [ - # 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=3277ba76d0ba7174608a31a0c6623e9210c63e3d"; - sha256 = "0xcp1qafvqnivvvi0byh51mbgqicjhmswwvqvamjz9rxfzm5f7d7"; - }) - ]; - preCheck = '' export LANG="en_US.UTF-8" ''; |