Skip to content

Commit 446d490

Browse files
authored
sage: 10.5.rc0 -> 10.5 (NixOS#361803)
2 parents 2b67662 + 8439c49 commit 446d490

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

pkgs/by-name/sa/sage/sage-src.nix

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@
1111
# all get the same sources with the same patches applied.
1212

1313
stdenv.mkDerivation rec {
14-
version = "10.5.rc0";
14+
version = "10.5";
1515
pname = "sage-src";
1616

1717
src = fetchFromGitHub {
1818
owner = "sagemath";
1919
repo = "sage";
2020
rev = version;
21-
hash = "sha256-qjgEgyPOpT/g7D8YNhkqO1EHGNftZnuR5ucLNZBa9Sg=";
21+
hash = "sha256-OiGMc3KyHWnjVWXJ/KiqEQS1skM9nPLYcoMK9kw4718=";
2222
};
2323

2424
# contains essential files (e.g., setup.cfg) generated by the bootstrap script.
2525
# TODO: investigate https://github.com/sagemath/sage/pull/35950
2626
configure-src = fetchurl {
2727
# the hash below is the tagged commit's _parent_. it can also be found by looking for
2828
# 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=";
3131
};
3232

3333
# Patches needed because of particularities of nix or the way this is packaged.
@@ -57,6 +57,13 @@ stdenv.mkDerivation rec {
5757
# compile libs/gap/element.pyx with -O1
5858
# a more conservative version of https://github.com/sagemath/sage/pull/37951
5959
./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+
})
6067
];
6168

6269
# Patches needed because of package updates. We could just pin the versions of

0 commit comments

Comments
 (0)