sage: 10.4 -> 10.5.rc0 (#357335)

authored by

Mauricio Collares and committed by
GitHub
b413874c 1c63bc84

+12 -54
+2 -10
pkgs/by-name/ga/gap/package.nix
··· 1 1 { stdenv 2 2 , lib 3 - , fetchpatch 4 3 , fetchurl 5 4 , makeWrapper 6 5 , readline ··· 67 66 stdenv.mkDerivation rec { 68 67 pname = "gap"; 69 68 # https://www.gap-system.org/Releases/ 70 - version = "4.12.2"; 69 + version = "4.13.1"; 71 70 72 71 src = fetchurl { 73 72 url = "https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz"; 74 - sha256 = "sha256-ZyMIdF63iiIklO6N1nhu3VvDMUVvzGRWrAZL2yjVh6g="; 73 + sha256 = "sha256-l5Tb26b7mY4KLQqoziH8iEitPT+cyZk7C44gvn4dvro="; 75 74 }; 76 - 77 - patches = [ 78 - (fetchpatch { 79 - url = "https://github.com/gap-system/gap/commit/c786e229413a44b7462196716b99ae9bb0071f4c.patch"; 80 - hash = "sha256-g3jrEMSavHAUKlHoPqWmOw49hWHU+29SA788Klnr0Uw="; 81 - }) 82 - ]; 83 75 84 76 # remove all non-essential packages (which take up a lot of space) 85 77 preConfigure = lib.optionalString (!keepAll) (removeNonWhitelistedPkgs packagesToKeep) + ''
+6 -6
pkgs/by-name/sa/sage/patches/sphinx-docbuild-subprocesses.patch
··· 1 1 diff --git a/src/sage_docbuild/builders.py b/src/sage_docbuild/builders.py 2 - index 871cc4705a2..4b718136b91 100644 2 + index ab39d93c280..e6501c083d5 100644 3 3 --- a/src/sage_docbuild/builders.py 4 4 +++ b/src/sage_docbuild/builders.py 5 5 @@ -106,31 +106,6 @@ def builder_helper(type): ··· 48 48 if build_options.ABORT_ON_ERROR: 49 49 raise 50 50 diff --git a/src/sage_docbuild/sphinxbuild.py b/src/sage_docbuild/sphinxbuild.py 51 - index 5621fe9e456..b1b91ce7b2c 100644 51 + index 62b2d3cb112..aa7dc07741b 100644 52 52 --- a/src/sage_docbuild/sphinxbuild.py 53 53 +++ b/src/sage_docbuild/sphinxbuild.py 54 - @@ -323,3 +323,8 @@ def runsphinx(): 55 - sys.stderr = saved_stderr 56 - sys.stdout.flush() 57 - sys.stderr.flush() 54 + @@ -331,3 +331,8 @@ def runsphinx(): 55 + 56 + if not sys.warnoptions: 57 + warnings.filters = original_filters[:] 58 58 + 59 59 +if __name__ == '__main__': 60 60 + import sys
+4 -38
pkgs/by-name/sa/sage/sage-src.nix
··· 11 11 # all get the same sources with the same patches applied. 12 12 13 13 stdenv.mkDerivation rec { 14 - version = "10.4"; 14 + version = "10.5.rc0"; 15 15 pname = "sage-src"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "sagemath"; 19 19 repo = "sage"; 20 20 rev = version; 21 - hash = "sha256-BDO00ZSm5lnjEuA56VsY/FZyAhoG1hkFxdIlTtBZVBA="; 21 + hash = "sha256-qjgEgyPOpT/g7D8YNhkqO1EHGNftZnuR5ucLNZBa9Sg="; 22 22 }; 23 23 24 24 # contains essential files (e.g., setup.cfg) generated by the bootstrap script. ··· 26 26 configure-src = fetchurl { 27 27 # the hash below is the tagged commit's _parent_. it can also be found by looking for 28 28 # the "configure" asset at https://github.com/sagemath/sage/releases/tag/${version} 29 - url = "mirror://sageupstream/configure/configure-3c279ec5712e0fa35c5733e03e010970727d7189.tar.gz"; 30 - hash = "sha256-3bRlgIUSIq9tDzvI+ZfEd5LMy1qHXdItEwu1say4cx4="; 29 + url = "mirror://sageupstream/configure/configure-d9c38a7c581e6ed54fbe420122b8bba488b16074.tar.gz"; 30 + hash = "sha256-y1EpsuYK9wloptjeiTew+TZaIUZ2K/NKCbSteojFa4s="; 31 31 }; 32 32 33 33 # Patches needed because of particularities of nix or the way this is packaged. ··· 54 54 # fix those bugs themselves. This is for critical bugfixes, where "critical" 55 55 # == "causes (transient) doctest failures / somebody complained". 56 56 bugfixPatches = [ 57 - # https://github.com/sagemath/sage/pull/38628, landed in 10.5.beta4 58 - (fetchpatch { 59 - name = "pari-stack-cysignals-exception.patch"; 60 - url = "https://github.com/sagemath/sage/commit/4a9c985b769b1209902c970ade1892f18ab48c10.diff"; 61 - hash = "sha256-S6NdonB7needJlQdx52Huk34Q8/vG3nyGicA5JpsdWc="; 62 - }) 63 - 64 - # https://github.com/sagemath/sage/pull/38851, landed in 10.5.beta8 65 - (fetchpatch { 66 - name = "glpk-aarch64-hang-workaround.patch"; 67 - url = "https://github.com/sagemath/sage/commit/ce4a78dcb4178f85273619cea076c97345977ee1.diff"; 68 - hash = "sha256-TibTx5llkXjkEZB/MDy4hfGwKBmwtitEpWP6K/ykke0="; 69 - }) 70 - 71 57 # compile libs/gap/element.pyx with -O1 72 58 # a more conservative version of https://github.com/sagemath/sage/pull/37951 73 59 ./patches/gap-element-crash.patch ··· 80 66 # should come from or be proposed to upstream. This list will probably never 81 67 # be empty since dependencies update all the time. 82 68 packageUpgradePatches = [ 83 - # https://github.com/sagemath/sage/pull/38500, landed in 10.5.beta3 84 - (fetchpatch { 85 - name = "cython-3.0.11-upgrade.patch"; 86 - url = "https://patch-diff.githubusercontent.com/raw/sagemath/sage/pull/38500.diff"; 87 - hash = "sha256-ePfH3Gy1T0UfpoVd3EZowCfy88CbE+yE2MV2itWthsA="; 88 - }) 89 - 90 - # https://github.com/sagemath/sage/pull/36641, landed in 10.5.beta3 91 - (fetchpatch { 92 - name = "sympy-1.13.2-update.patch"; 93 - url = "https://github.com/sagemath/sage/commit/100189fa62f9a40e7aa0d856615366ea99b87aff.diff"; 94 - sha256 = "sha256-uWr3I15WByQYGVxbJFqG4zUJ7c7+4rjkcgwkAT85O7w="; 95 - }) 96 - 97 - # https://github.com/sagemath/sage/pull/38250, landed in 10.5.beta0 98 - (fetchpatch { 99 - name = "numpy-2.0-compat.patch"; 100 - url = "https://github.com/sagemath/sage/commit/0962e0bcb159d342e7c7d83557a71e7b670fff47.diff"; 101 - sha256 = "sha256-4SBhgPgT9VsBxcBH8+T5uYtWzYP5tZi9+iKOG55hWgI="; 102 - }) 103 69 ]; 104 70 105 71 patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;