From d7f5c97885e46c91bd870a56b8b179ad25dd61df Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Tue, 21 Jun 2022 17:33:31 +0200 Subject: [PATCH 1/2] eclib: 20210625 -> 20220621 --- pkgs/development/libraries/eclib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index 74a6f21992b5..af358be31218 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -14,7 +14,7 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { pname = "eclib"; - version = "20210625"; # upgrade might break the sage interface + version = "20220621"; # upgrade might break the sage interface # sage tests to run: # src/sage/interfaces/mwrank.py # src/sage/libs/eclib @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # 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="; + sha256 = "sha256-EfoCNhnXGuN5SxgPFES4BaevhSRzU1JvT3ARq9NMJhM="; }; buildInputs = [ pari From 55a53e1dec01d618a5f448b6a774fc0a05d813a5 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Mon, 11 Jul 2022 10:48:13 +0200 Subject: [PATCH 2/2] sage: apply eclib 20220621 update patch --- pkgs/applications/science/math/sage/sage-src.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 95da9b26e54e..a0375a5184a8 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -117,6 +117,13 @@ stdenv.mkDerivation rec { # 5.0 hits nixpkgs. # https://github.com/sphinx-doc/sphinx/pull/10372 ./patches/docutils-0.18.1-deprecation.patch + + (fetchSageDiff { + name = "eclib-20220621-update.patch"; + base = "9.7.beta4"; + rev = "9b65d73399b33043777ba628a4d318638aec6e0e"; + sha256 = "sha256-pcb9Q9a0ROCZTyfT7TRMtgEqCom8SgrtAaZ8ATgeqVI="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;