Merge pull request #74372 from r-ryantm/auto-update/fplll

fplll: 5.2.1 -> 5.3.0, python.pkgs.fpylll: 0.4.1dev -> 0.5.0dev
This commit is contained in:
Michael Raskin 2019-12-12 19:56:11 +00:00 committed by GitHub
commit c2ae05d597
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 54 additions and 16 deletions

View File

@ -1,22 +1,55 @@
{stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, autoreconfHook { stdenv
, gmp, mpfr , fetchFromGitHub
, fetchpatch
, gettext
, autoreconfHook
, gmp
, mpfr
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fplll"; pname = "fplll";
version = "5.2.1"; version = "5.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = "fplll";
repo = pname; repo = "fplll";
rev = version; rev = version;
sha256 = "015qmrd7nfaysbv1hbwiprz9g6hnww1y1z1xw8f43ysb7k1b5nbg"; sha256 = "0wxa4xs7as7y47h7i6prmk5r0srabdvrlkvza3j50pixir5swgvh";
}; };
nativeBuildInputs = [autoconf automake libtool gettext autoreconfHook];
buildInputs = [gmp mpfr]; patches = [
meta = { # https://github.com/fplll/fpylll/issues/161
inherit version; (fetchpatch {
name = "fix-out-of-bounds-access.patch";
url = "https://github.com/fplll/fplll/pull/398/commits/f68e257228bf073ef380f996326d02197ce7b0e4.patch";
sha256 = "1rapkcf389lf579va6kbnvhzyv36n4l4d9n0vg2zxprvql8wvm7m";
})
];
nativeBuildInputs = [
gettext
autoreconfHook
];
buildInputs = [
gmp
mpfr
];
meta = with stdenv.lib; {
description = ''Lattice algorithms using floating-point arithmetic''; description = ''Lattice algorithms using floating-point arithmetic'';
license = stdenv.lib.licenses.lgpl21Plus; changelog = [
maintainers = [stdenv.lib.maintainers.raskin]; # Some release notes are added to the github tags, though they are not
platforms = stdenv.lib.platforms.unix; # always complete.
"https://github.com/fplll/fplll/releases/tag/${version}"
# Releases are announced on this mailing list. Unfortunately it is not
# possible to generate a direct link to the most recent announcement, but
# this search should find it.
"https://groups.google.com/forum/#!searchin/fplll-devel/FPLLL$20${version}"
];
license = licenses.lgpl21Plus;
maintainers = with maintainers; [raskin timokau];
platforms = platforms.unix;
}; };
} }

View File

@ -14,13 +14,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "fpylll"; pname = "fpylll";
version = "0.4.1dev"; version = "0.5.0dev";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fplll"; owner = "fplll";
repo = "fpylll"; repo = "fpylll";
rev = version; rev = version;
sha256 = "01x2sqdv0sbjj4g4waj0hj4rcn4bq7h17442xaqwbznym9azmn9w"; sha256 = "091zqgsqd5cqma1hvimkq5xpr9f1jw80v9m2fr6k9hvssqjzgnab";
}; };
buildInputs = [ buildInputs = [
@ -45,11 +45,16 @@ buildPythonPackage rec {
]; ];
checkPhase = '' checkPhase = ''
py.test # Since upstream introduced --doctest-modules in
# https://github.com/fplll/fpylll/commit/9732fdb40cf1bd43ad1f60762ec0a8401743fc79,
# it is necessary to ignore import mismatches. Not sure why, but the files
# should be identical anyway.
PY_IGNORE_IMPORTMISMATCH=1 pytest
''; '';
meta = { meta = {
description = "A Python interface for fplll"; description = "A Python interface for fplll";
changelog = "https://github.com/fplll/fpylll/releases/tag/${version}";
homepage = https://github.com/fplll/fpylll; homepage = https://github.com/fplll/fpylll;
maintainers = with lib.maintainers; [ timokau ]; maintainers = with lib.maintainers; [ timokau ];
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;