mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 00:43:20 +00:00
cypari2: 2.1.1 -> 2.1.2
* cypari2: 2.1.1 -> 2.1.2, patch to fix segfault * sage: update test expectations
This commit is contained in:
parent
5e4a4e0c32
commit
15fd117e71
@ -153,6 +153,14 @@ stdenv.mkDerivation rec {
|
||||
rev = "75c1516f0abb9e6f8c335e38e4031f6ef674ed30";
|
||||
sha256 = "sha256-RukkieIZcXNrju904H2oyGKdtpdE+9vNzvyjN2IBNg0=";
|
||||
})
|
||||
|
||||
# cypari 2.1.2 update (https://trac.sagemath.org/ticket/31029)
|
||||
(fetchSageDiff {
|
||||
base = "9.3.beta3";
|
||||
name = "cypari-2.1.2-update.patch";
|
||||
rev = "b9aadfd08e81d74ca7c229bb80eb853b592887d0";
|
||||
sha256 = "sha256-eKaMy7kpu+YKdL8bPStgocxBCTfc2Z/10RrGy2LENFw=";
|
||||
})
|
||||
];
|
||||
|
||||
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, python
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, pari
|
||||
, gmp
|
||||
@ -11,13 +12,23 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "cypari2";
|
||||
# upgrade may break sage, please test the sage build or ping @timokau on upgrade
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "df1ef62e771ec36e5a456f5fc8b51bc6745b70f0efdd0c7a30c3f0b5f1fb93db";
|
||||
sha256 = "03cd45edab8716ebbfdb754e65fea72e873c73dc91aec098fe4a01e35324ac7a";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# patch to avoid some segfaults in sage's totallyreal.pyx test.
|
||||
# (https://trac.sagemath.org/ticket/27267). depends on Cython patch.
|
||||
(fetchpatch {
|
||||
name = "use-trashcan-for-gen.patch";
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/cypari/patches/trashcan.patch?id=b6ea17ef8e4d652de0a85047bac8d41e90b25555";
|
||||
sha256 = "sha256-w4kktWb9/aR9z4CjrUvAMOxEwRN2WkubaKzQttN8rU8=";
|
||||
})
|
||||
];
|
||||
|
||||
# This differs slightly from the default python installPhase in that it pip-installs
|
||||
# "." instead of "*.whl".
|
||||
# That is because while the default install phase succeeds to build the package,
|
||||
@ -48,7 +59,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cython bindings for PARI";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = teams.sage.members;
|
||||
homepage = "https://github.com/defeo/cypari2";
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user