|
11 | 11 | # all get the same sources with the same patches applied. |
12 | 12 |
|
13 | 13 | stdenv.mkDerivation rec { |
14 | | - version = "10.5.rc0"; |
| 14 | + version = "10.5"; |
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-qjgEgyPOpT/g7D8YNhkqO1EHGNftZnuR5ucLNZBa9Sg="; |
| 21 | + hash = "sha256-OiGMc3KyHWnjVWXJ/KiqEQS1skM9nPLYcoMK9kw4718="; |
22 | 22 | }; |
23 | 23 |
|
24 | 24 | # contains essential files (e.g., setup.cfg) generated by the bootstrap script. |
25 | 25 | # TODO: investigate https://github.com/sagemath/sage/pull/35950 |
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-d9c38a7c581e6ed54fbe420122b8bba488b16074.tar.gz"; |
30 | | - hash = "sha256-y1EpsuYK9wloptjeiTew+TZaIUZ2K/NKCbSteojFa4s="; |
| 29 | + url = "mirror://sageupstream/configure/configure-f6ad0ecf1f4a269f5954d5487336b13f70624594.tar.gz"; |
| 30 | + hash = "sha256-VANtZDUhjOHap9XVEuG/1003E+1XRdXEnuH15hIqJd4="; |
31 | 31 | }; |
32 | 32 |
|
33 | 33 | # Patches needed because of particularities of nix or the way this is packaged. |
@@ -57,6 +57,13 @@ stdenv.mkDerivation rec { |
57 | 57 | # compile libs/gap/element.pyx with -O1 |
58 | 58 | # a more conservative version of https://github.com/sagemath/sage/pull/37951 |
59 | 59 | ./patches/gap-element-crash.patch |
| 60 | + |
| 61 | + # https://github.com/sagemath/sage/pull/38940, positively reviewed, to land in 10.6.beta0 |
| 62 | + (fetchpatch { |
| 63 | + name = "simplicial-sets-flaky-test.patch"; |
| 64 | + url = "https://github.com/sagemath/sage/commit/1830861c5130d30b891e8c643308e1ceb91ce2b5.diff"; |
| 65 | + hash = "sha256-6MbZ+eJPFBEtnJsJX0MgO2AykPXSeuya0W0adiIH+KE="; |
| 66 | + }) |
60 | 67 | ]; |
61 | 68 |
|
62 | 69 | # Patches needed because of package updates. We could just pin the versions of |
|
0 commit comments