JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #76531 from timokau/sympy-1.5

Browse Source 
python.pkgs.sympy: 1.4 -> 1.5
This commit is contained in:
Timo Kaufmann 2019-12-26 13:12:21 +01:00 committed by GitHub
commit 98e6a8b579
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/science/math/sage/sage-src.nix
View File

@ -118,6 +118,13 @@ stdenv.mkDerivation rec {
url = "https://git.sagemath.org/sage.git/patch?id=fcc11d6effa39f375bc5f4ea5831fb7a2f2767da"; url = "https://git.sagemath.org/sage.git/patch?id=fcc11d6effa39f375bc5f4ea5831fb7a2f2767da";
sha256 = "0hnmc8ld3bblks0hcjvjjaydkgwdr1cs3dbl2ys4gfq964pjgqwc"; 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; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

12
pkgs/development/python-modules/sympy/default.nix
View File

@ -8,11 +8,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "sympy"; 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 { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1q937csy8rd18pk2fz1ssj7jyj7l3rjx4nzbiz5vcymfhrb1x8bi"; sha256 = "1s4w7q8gndim2ky825a84jmwcf7ryfn10wm8yxz9dw5z2307smii";
}; };
checkInputs = [ glibcLocales ]; checkInputs = [ glibcLocales ];
@ -22,14 +22,6 @@ buildPythonPackage rec {
# tests take ~1h # tests take ~1h
doCheck = false; 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 = '' preCheck = ''
export LANG="en_US.UTF-8" export LANG="en_US.UTF-8"
''; '';