From c0871b5c48cbeedd67e5f69ba31afe158dcd9a76 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 22 Dec 2019 16:46:14 +0100 Subject: [PATCH 1/2] python.pkgs.fpylll: 0.5.0dev -> 0.5.1dev --- pkgs/development/python-modules/fpylll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index 7bc4ed82fea7..b342bc4d3e80 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.5.0dev"; + version = "0.5.1dev"; src = fetchFromGitHub { owner = "fplll"; repo = "fpylll"; rev = version; - sha256 = "091zqgsqd5cqma1hvimkq5xpr9f1jw80v9m2fr6k9hvssqjzgnab"; + sha256 = "15vdfgx448mr1nf054h7lr2j3dd35fsfhikqzrh9zsng8n12hxa5"; }; buildInputs = [ From 80b0639857aa2c1c3b31498d94c14fdc730d9100 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 22 Dec 2019 17:05:21 +0100 Subject: [PATCH 2/2] python.pkgs.fpylll: fix tests on aarch64 --- .../development/python-modules/fpylll/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index b342bc4d3e80..e23351d3da6d 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , buildPythonPackage , pkgconfig , gmp @@ -23,6 +24,20 @@ buildPythonPackage rec { sha256 = "15vdfgx448mr1nf054h7lr2j3dd35fsfhikqzrh9zsng8n12hxa5"; }; + patches = [ + # two patches to fix the testsuite on aarch64 (https://github.com/fplll/fpylll/issues/162) + (fetchpatch { + url = "https://github.com/fplll/fpylll/commit/d5809a8fdb86b2693b1fa94e655bbbe4ad80e286.patch"; + name = "less-precision-in-tests.patch"; + sha256 = "0vkvi25nwwvk5r4a4xmkbf060di4hjq32bys75l2hsaysxmk93nz"; + }) + (fetchpatch { + url = "https://github.com/fplll/fpylll/commit/b5b146a010d50da219a313adc4b6f7deddcc146b.patch"; + name = "dont-hardcode-precision.patch"; + sha256 = "1rsbwh90i1j5p2rp6jd5n25v1jzw1n8728fzz1lhb91zmk0hlxc9"; + }) + ]; + buildInputs = [ gmp pari