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

Revert "pythonPackages.cypari2: 1.3.1 -> 2.0.1 (#49446)" (#51414)

Browse Source 
This reverts commit d9b650f4cc5ba78835285963eeef8a7c23b593f8.

The update is causing segfaults. See
https://trac.sagemath.org/ticket/26442.
This commit is contained in:
Timo Kaufmann 2018-12-03 00:44:33 +01:00 committed by GitHub
parent 4711bd2fe6
commit 5f2b8de75c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,20 +113,6 @@ stdenv.mkDerivation rec {
rev = "db10d327ade93711da735a599a67580524e6f7b4"; rev = "db10d327ade93711da735a599a67580524e6f7b4";
sha256 = "09v87id25fa5r9snfn4mv79syhc77jxfawj5aizmdpwdmpgxjk1f"; sha256 = "09v87id25fa5r9snfn4mv79syhc77jxfawj5aizmdpwdmpgxjk1f";
}) })
# https://trac.sagemath.org/ticket/26493
(fetchpatch {
name = "cypari-upgrade-dependency.patch";
url = "https://git.sagemath.org/sage.git/patch/?id=e93130960a1a20112bff096f53bc48ffcdfe5ab2";
sha256 = "03zh5288aasy47d964rs8vhaxds397rsp85ssbbrkap8702r4bjh";
})
# https://trac.sagemath.org/ticket/26442
(fetchpatch {
name = "cypari-2.0.0.patch";
url = "https://git.sagemath.org/sage.git/patch/?h=7905b39a510c2e09b1ebf0d4a11342bfe3c0d236";
sha256 = "0v8p5x1b6mnkb2j3a95iva9dmq4pxi154zz4nmj79dcyqi51crwm";
excludes = [ "build/*" ];
})
]; ];
patches = nixPatches ++ packageUpgradePatches; patches = nixPatches ++ packageUpgradePatches;

4
pkgs/development/python-modules/cypari2/default.nix
View File

@ -12,11 +12,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cypari2"; pname = "cypari2";
# upgrade may break sage, please test the sage build or ping @timokau on upgrade # upgrade may break sage, please test the sage build or ping @timokau on upgrade
version = "2.0.1"; version = "1.3.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "11nqp40nji8bz4zn7j8sbzin93l65kf8s1sc76lvbsbkswaxdyij"; sha256 = "04f00xp8aaz37v00iqg1mv5wjq00a5qhk8cqa93s13009s9x984r";
}; };
# This differs slightly from the default python installPhase in that it pip-installs # This differs slightly from the default python installPhase in that it pip-installs