3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #123692 from collares/eclib-20210503

This commit is contained in:
Sandro 2021-07-06 01:59:32 +02:00 committed by GitHub
commit 90fa755d73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 7 deletions

View file

@ -126,6 +126,15 @@ stdenv.mkDerivation rec {
rev = "bc84af8c795b7da433d2000afc3626ee65ba28b8";
sha256 = "sha256-5Kvs9jarC8xRIU1rdmvIWxQLC25ehiTLJpg5skh8WNM=";
})
# eclib 20210625 update
# https://trac.sagemath.org/ticket/31443
(fetchSageDiff {
base = "9.4.beta3";
name = "eclib-20210625.patch";
rev = "789550ca04c94acfb1e803251538996a34962038";
sha256 = "sha256-VlyEn5hg3joG8t/GwiRfq9TzJ54AoHxLolsNQ3shc2c=";
})
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

View file

@ -1,5 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
, fetchurl
, autoreconfHook
, pari
, ntl
@ -14,16 +14,22 @@ assert withFlint -> flint != null;
stdenv.mkDerivation rec {
pname = "eclib";
version = "20190909"; # upgrade might break the sage interface
version = "20210625"; # upgrade might break the sage interface
# sage tests to run:
# src/sage/interfaces/mwrank.py
# src/sage/libs/eclib
# ping @timokau for more info
src = fetchFromGitHub {
owner = "JohnCremona";
repo = pname;
rev = "v${version}";
sha256 = "0y1vdi4120gdw56gg2dn3wh625yr9wpyk3wpbsd25w4lv83qq5da";
src = fetchurl {
# all releases for this project appear on its GitHub releases page
# by definition! other distros sometimes update whenever they see
# a version bump in configure.ac or a new tag (and this might show
# up on repology). however, a version bump or a new tag may not
# represent a new release, and a new release might not be tagged.
#
# see https://github.com/JohnCremona/eclib/issues/64#issuecomment-789788561
# for upstream's explanation of the above
url = "https://github.com/JohnCremona/eclib/releases/download/${version}/eclib-${version}.tar.bz2";
sha256 = "sha256-fA3MPz/L+Q39sA8wxAYOUowlHRcgOd8VF4tpsBGI6BA=";
};
buildInputs = [
pari