From ed8d53655fe36e69262ae517f388ec016b3a5ad0 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 9 Dec 2019 08:11:20 +0100 Subject: [PATCH 1/6] fplll: update formatting According to my perception of the current community standards. --- pkgs/development/libraries/fplll/default.nix | 42 +++++++++++++++----- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index c2952cb47f1..bc337da501a 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -1,22 +1,42 @@ -{stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, autoreconfHook -, gmp, mpfr +{ stdenv +, fetchFromGitHub +, autoconf +, automake +, libtool +, gettext +, autoreconfHook +, gmp +, mpfr }: + stdenv.mkDerivation rec { pname = "fplll"; version = "5.2.1"; + src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "fplll"; + repo = "fplll"; rev = version; sha256 = "015qmrd7nfaysbv1hbwiprz9g6hnww1y1z1xw8f43ysb7k1b5nbg"; }; - nativeBuildInputs = [autoconf automake libtool gettext autoreconfHook]; - buildInputs = [gmp mpfr]; - meta = { - inherit version; + + nativeBuildInputs = [ + autoconf + automake + libtool + gettext + autoreconfHook + ]; + + buildInputs = [ + gmp + mpfr + ]; + + meta = with stdenv.lib; { description = ''Lattice algorithms using floating-point arithmetic''; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [raskin]; + platforms = platforms.unix; }; } From 0fa66219ccfb29c7023aa8af1df7f52fbd8bd5d8 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 9 Dec 2019 08:13:00 +0100 Subject: [PATCH 2/6] fplll: clean up dependencies autoreconfHook implies autotools. --- pkgs/development/libraries/fplll/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index bc337da501a..d00c9cac93e 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -1,8 +1,5 @@ { stdenv , fetchFromGitHub -, autoconf -, automake -, libtool , gettext , autoreconfHook , gmp @@ -21,9 +18,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoconf - automake - libtool gettext autoreconfHook ]; From cf0419e7d5c774ea1d94261174e14eac2e810338 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 9 Dec 2019 08:20:03 +0100 Subject: [PATCH 3/6] fplll: add changelog --- pkgs/development/libraries/fplll/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index d00c9cac93e..10f30a50477 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -29,6 +29,15 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''Lattice algorithms using floating-point arithmetic''; + changelog = [ + # Some release notes are added to the github tags, though they are not + # 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]; platforms = platforms.unix; From d69b099f285695c81e2c284dd60f2fd506c2194f Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 9 Dec 2019 08:20:20 +0100 Subject: [PATCH 4/6] fplll: add timokau to the maintainers list --- pkgs/development/libraries/fplll/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index 10f30a50477..829117adf8c 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { "https://groups.google.com/forum/#!searchin/fplll-devel/FPLLL$20${version}" ]; license = licenses.lgpl21Plus; - maintainers = with maintainers; [raskin]; + maintainers = with maintainers; [raskin timokau]; platforms = platforms.unix; }; } From da7ca3fa87d4626150dc6e09821aa0213f214594 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 2 Dec 2019 11:41:59 +0100 Subject: [PATCH 5/6] fplll: 5.2.1 -> 5.3.0, python.pkgs.fpylll: 0.4.1dev -> 0.5.0dev The two packages need to be updated together, since fpylll 0.4.1 requires the old fplll version and fpylll 0.5.0 requires the new one. --- pkgs/development/libraries/fplll/default.nix | 14 ++++++++++++-- pkgs/development/python-modules/fpylll/default.nix | 10 +++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index 829117adf8c..694b6d567eb 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , gettext , autoreconfHook , gmp @@ -8,15 +9,24 @@ stdenv.mkDerivation rec { pname = "fplll"; - version = "5.2.1"; + version = "5.3.0"; src = fetchFromGitHub { owner = "fplll"; repo = "fplll"; rev = version; - sha256 = "015qmrd7nfaysbv1hbwiprz9g6hnww1y1z1xw8f43ysb7k1b5nbg"; + sha256 = "0wxa4xs7as7y47h7i6prmk5r0srabdvrlkvza3j50pixir5swgvh"; }; + patches = [ + # https://github.com/fplll/fpylll/issues/161 + (fetchpatch { + name = "fix-out-of-bounds-access.patch"; + url = "https://github.com/fplll/fplll/pull/398/commits/f68e257228bf073ef380f996326d02197ce7b0e4.patch"; + sha256 = "1rapkcf389lf579va6kbnvhzyv36n4l4d9n0vg2zxprvql8wvm7m"; + }) + ]; + nativeBuildInputs = [ gettext autoreconfHook diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index a27e9494911..3236a3de16f 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "fpylll"; - version = "0.4.1dev"; + version = "0.5.0dev"; src = fetchFromGitHub { owner = "fplll"; repo = "fpylll"; rev = version; - sha256 = "01x2sqdv0sbjj4g4waj0hj4rcn4bq7h17442xaqwbznym9azmn9w"; + sha256 = "091zqgsqd5cqma1hvimkq5xpr9f1jw80v9m2fr6k9hvssqjzgnab"; }; buildInputs = [ @@ -45,7 +45,11 @@ buildPythonPackage rec { ]; 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 = { From 0dcd09b1b6088d31f4bc9e23bb87466b0bfd591a Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 12 Dec 2019 17:49:10 +0100 Subject: [PATCH 6/6] python.pkgs.fpylll: add changelog --- pkgs/development/python-modules/fpylll/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index 3236a3de16f..7bc4ed82fea 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = { description = "A Python interface for fplll"; + changelog = "https://github.com/fplll/fpylll/releases/tag/${version}"; homepage = https://github.com/fplll/fpylll; maintainers = with lib.maintainers; [ timokau ]; license = lib.licenses.gpl2Plus;