From f94a4750c6319951f5cd25e237be856766592600 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Nov 2024 01:45:41 +0000 Subject: [PATCH 1/2] eclib: 20240408 -> 20250122 --- pkgs/by-name/ec/eclib/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ec/eclib/package.nix b/pkgs/by-name/ec/eclib/package.nix index 0c886a265b63..8eb4a1f0bab0 100644 --- a/pkgs/by-name/ec/eclib/package.nix +++ b/pkgs/by-name/ec/eclib/package.nix @@ -14,7 +14,7 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { pname = "eclib"; - version = "20240408"; # upgrade might break the sage interface + version = "20250122"; # upgrade might break the sage interface # sage tests to run: # src/sage/interfaces/mwrank.py # src/sage/libs/eclib @@ -28,8 +28,8 @@ 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/v${version}/eclib-${version}.tar.bz2"; - sha256 = "sha256-O6kI4gGd5T/LoUFEnKpvqC8DYFv4O/nagJLfU4ravnw="; + url = "https://github.com/JohnCremona/eclib/releases/download/${version}/eclib-${version}.tar.bz2"; + sha256 = "sha256-n4wrMuJKTyDXzC0zbqMMjqA7WwlTwtMq3aDEludhaJk="; }; buildInputs = [ pari From ffcbedd6e3cf2a09fff0f3123aa84d2ab8534479 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Wed, 29 Jan 2025 19:13:13 +0100 Subject: [PATCH 2/2] sage: import eclib update patch --- pkgs/by-name/sa/sage/sage-src.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix index 94bbf2c4deb0..7132847c64ea 100644 --- a/pkgs/by-name/sa/sage/sage-src.nix +++ b/pkgs/by-name/sa/sage/sage-src.nix @@ -96,6 +96,13 @@ stdenv.mkDerivation rec { url = "https://github.com/sagemath/sage/compare/10.6.beta2...26f411e5939718d4439325ff669635e5a72d50e5.diff"; hash = "sha256-Z4JwCuUDpqktAzNtVKRUbrJEh7TmCtFI7PJnOrcEbr4="; }) + + # https://github.com/sagemath/sage/pull/38962, landed in 10.6.beta7 + (fetchpatch { + name = "eclib-update.patch"; + url = "https://github.com/sagemath/sage/commit/5289298248a1d6ab11ccf169e636d951f1d77c41.diff"; + hash = "sha256-iQNqvywvtnvqAA9o8zn4il/XIFBiuEX+vSFZHPaPzcs="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;