From 69555825f84a0f81c32097913088ab586e12b982 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Tue, 2 Apr 2019 15:39:20 +0000 Subject: [PATCH] eclib: 20180815 -> 20190226 (#58801) Needs a sage patch, see https://trac.sagemath.org/ticket/27360. --- pkgs/applications/science/math/sage/sage-src.nix | 7 +++++++ pkgs/development/libraries/eclib/default.nix | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index dd51059ff01..75cd308da40 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -137,6 +137,13 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/27405 ./patches/ignore-pip-deprecation.patch + + # https://trac.sagemath.org/ticket/27360 + (fetchpatch { + name = "eclib-20190226.patch"; + url = "https://git.sagemath.org/sage.git/patch/?id=f570e3a7fc2965764b84c04ce301a88ded2c42df"; + sha256 = "0l5c4giixkn15v2a06sfzq5mkxila6l67zkjbacirwprrlpcnmmp"; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index 2a43cbe8ee5..681062cd671 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -16,7 +16,7 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "eclib"; - version = "20180815"; # upgrade might break the sage interface + version = "20190226"; # upgrade might break the sage interface # sage tests to run: # src/sage/interfaces/mwrank.py # src/sage/libs/eclib @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "JohnCremona"; repo = "${pname}"; rev = "v${version}"; - sha256 = "12syn83lnzx0xc4r1v3glfimbzndyilkpdmx50xrihbjz1hzczif"; + sha256 = "1910np1xzyjzszay24xn4b81qhpsvhp5aix9vdpknplni2mq8kwb"; }; buildInputs = [ pari