From 1104a229626fecfffe25e172201567ee8c6ec791 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Sun, 28 May 2023 14:28:27 +0200 Subject: [PATCH 1/3] sage: refresh patches --- .../science/math/sage/sage-src.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 4f533a822de7..1af5ce805698 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -52,32 +52,32 @@ stdenv.mkDerivation rec { # should come from or be proposed to upstream. This list will probably never # be empty since dependencies update all the time. packageUpgradePatches = [ - # https://github.com/sagemath/sage/pull/35584, positively reviewed + # https://github.com/sagemath/sage/pull/35584, landed in 10.1.beta1 (fetchpatch { name = "networkx-3.1-upgrade.patch"; - url = "https://github.com/sagemath/sage/compare/10.0.rc2..e599562cf5fdfb9799a5412fac40c2f8e9f97341.diff"; - sha256 = "sha256-3A90kXqNR0c7+k8xrZXAt5wqWg/VFAPNhQujwTdOyhI="; + url = "https://github.com/sagemath/sage/commit/be0aab74fd7e399e146988ef27260d2837baebae.diff"; + sha256 = "sha256-xBGrylNaiF7CpfmX9/4lTioP2LSYKoRCkKlKSGZuv9U="; }) - # https://github.com/sagemath/sage/pull/35612, positively reviewed + # https://github.com/sagemath/sage/pull/35612, landed in 10.1.beta1 (fetchpatch { name = "linbox-1.7-upgrade.patch"; - url = "https://github.com/sagemath/sage/compare/10.0.rc2..9c8796c7b677e3a056348e3510331ea8b8c3c42e.diff"; + url = "https://github.com/sagemath/sage/commit/35cbd2f2a2c4c355455d39b1424f05ea0aa4349b.diff"; sha256 = "sha256-/TpvIQZUqmbUuz6wvp3ni9oRir5LBA2FKDJcmnHI1r4="; }) - # https://github.com/sagemath/sage/pull/35619 + # https://github.com/sagemath/sage/pull/35619, landed in 10.1.beta1 (fetchpatch { name = "maxima-5.46.0-upgrade.patch"; - url = "https://github.com/sagemath/sage/compare/10.0.rc3..7e86af5dae8f89868b25a6f57189bb5ca618da89.diff"; - sha256 = "sha256-pxSxdJ2lyHoMUIxhlIn1nTHaddRxGvvTj9IbwFCTBFU="; + url = "https://github.com/sagemath/sage/commit/4ddf9328e7598284d4bc03cd2ed890f0be6b6399.diff"; + sha256 = "sha256-f6YaZiLSj+E0LJMsMZHDt6vecWffSAuUHYVkegBEhno="; }) - # https://github.com/sagemath/sage/pull/35635, positively reviewed + # https://github.com/sagemath/sage/pull/35635, landed in 10.1.beta1 (fetchpatch { name = "sympy-1.12-upgrade.patch"; - url = "https://github.com/sagemath/sage/compare/10.0.rc2..aa4193cdc8ec9fb7bd7c49696b7f914668f7913a.diff"; - sha256 = "sha256-UAmYCxHvnE5p+H2DySNZTPFVm915jHtOEoG+tZz5n7I="; + url = "https://github.com/sagemath/sage/commit/1a73b3bbbfa0f4a297e05d49305070e1ed5ae598.diff"; + sha256 = "sha256-k8Oam+EiRcfXC7qCdLacCx+7vpUAw2K1wsjKcQbeGb4="; }) ]; From 69cc6c07ac8fd4a652fd6480e9e567bda7265c6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Jun 2023 04:26:47 +0000 Subject: [PATCH 2/3] singular: 4.3.2p1 -> 4.3.2p2 --- pkgs/applications/science/math/singular/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index c67057d3ac59..1f06f0d1aef3 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "singular"; - version = "4.3.2p1"; + version = "4.3.2p2"; # since the tarball does not contain tests, we fetch from GitHub. src = fetchFromGitHub { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # if a release is tagged (which sometimes does not happen), it will # be in the format below. rev = "Release-${lib.replaceStrings ["."] ["-"] version}"; - sha256 = "sha256-fprlqJ/3vhnUBnopOhWi4TWMKjcJ4qDQGq8vaaGzy2E="; + sha256 = "sha256-dtZmN8xUCZ9eSgmtBxqfJeWsM4W5Baq7xWXuNAxNLjA="; # the repository's .gitattributes file contains the lines "/Tst/ # export-ignore" and "/doc/ export-ignore" so some directories are From 8f216662cbe2ff680108e2fc0d49f419fd1e4ef1 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Sun, 9 Jul 2023 12:59:45 +0100 Subject: [PATCH 3/3] sage: import singular 4.3.2p2 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 1af5ce805698..d890a65230cb 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -79,6 +79,13 @@ stdenv.mkDerivation rec { url = "https://github.com/sagemath/sage/commit/1a73b3bbbfa0f4a297e05d49305070e1ed5ae598.diff"; sha256 = "sha256-k8Oam+EiRcfXC7qCdLacCx+7vpUAw2K1wsjKcQbeGb4="; }) + + # https://github.com/sagemath/sage/pull/35825, landed in 10.1.beta6 + (fetchpatch { + name = "singular-4.3.2p2-upgrade.patch"; + url = "https://github.com/sagemath/sage/commit/1a1b49f814cdf4c4c8d0ac8930610f3fef6af5b0.diff"; + sha256 = "sha256-GqMgoi0tsP7zcCcPumhdsbvhPB6fgw1ufx6gHlc6iSc="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;