Merge pull request #82316 from timokau/sage-pari-2.11.3

sage, pari: fix pari 2.11.3
This commit is contained in:
Timo Kaufmann 2020-03-12 12:23:32 +00:00 committed by GitHub
commit a3735dcbd7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions

View file

@ -1,5 +1,6 @@
{ stdenv
, fetchurl
, fetchpatch
, gmp
, readline
, libX11
@ -19,6 +20,15 @@ stdenv.mkDerivation rec {
sha256 = "1jd65h2psrmba2dx7rkf5qidf9ka0cwbsg20pd18k45ggr30l467";
};
patches = [
# https://trac.sagemath.org/ticket/29313#comment:1
(fetchpatch {
name = "backport-bug-fix.patch";
url = "https://git.archlinux.org/svntogit/community.git/plain/repos/community-x86_64/c7a1d35f.patch?h=packages/pari&id=27893d227290dc3821d68aa25877d9765c204dad";
sha256 = "0vm0fwyzj66cr32imip6srksd47s2s2sjl1rb26ph8gpfi3nalii";
})
];
buildInputs = [
gmp
readline

View file

@ -130,6 +130,13 @@ stdenv.mkDerivation rec {
url = "https://git.sagemath.org/sage.git/patch/?h=c6d0308db15efd611211d26cfcbefbd180fc0831";
sha256 = "0nwai2jr22h49km4hx3kwafs3mzsc5kwsv7mqwjf6ibwfx2bbgyq";
})
# https://trac.sagemath.org/ticket/29313 (patch from ArchLinux)
(fetchpatch {
name = "pari-2.11.3.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/sagemath-pari-2.11.3.patch?h=sagemath-git&id=02e1d58bd1cd70935d69a4990469d18be6bd2c43";
sha256 = "0z07444zvijyw96d11q7j81pvg7ysd6ycf1bbbjr6za9y74hv7d2";
})
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;