Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions pkgs/applications/science/math/sage/sage-src.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
20 changes: 13 additions & 7 deletions pkgs/development/libraries/eclib/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
, fetchurl
, autoreconfHook
, pari
, ntl
Expand All @@ -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
Expand Down