@@ -114,18 +114,26 @@ stdenv.mkDerivation rec {
114114 # strictly necessary, but keeps us from littering in the user's HOME.
115115 ./patches/sympow-cache.patch
116116
117+ # Upstream will wait until Sage 9.7 to upgrade to linbox 1.7 because it
118+ # does not support gcc 6. We can upgrade earlier.
119+ # https://trac.sagemath.org/ticket/32959
120+ ./patches/linbox-1.7-upgrade.patch
121+
117122 # https://trac.sagemath.org/ticket/32968
118123 (fetchSageDiff {
119− base = "9.5.beta8";
124+ base = "9.5";
120125 name = "sphinx-4.3-update.patch";
121126 rev = "fc84f82f52b6f05f512cb359ec7c100f93cf8841";
122127 sha256 = "sha256-bBbfdcnw/9LUOlY8rHJRbFJEdMXK4shosqTNaobTS1Q=";
123128 })
124129
125− # Upstream has not upgraded to linbox 1.7 yet because it conflicts with
126− # pre-4.2.1p3 versions of Singular, but we don't have this problem.
127− # https://trac.sagemath.org/ticket/32959
128− ./patches/linbox-1.7-upgrade.patch
130+ # https://trac.sagemath.org/ticket/33189
131+ (fetchSageDiff {
132+ base = "9.5";
133+ name = "arb-2.22-update.patch";
134+ rev = "53532ddd4e2dc92469c1590ebf0c40f8f69bf579";
135+ sha256 = "sha256-6SoSBvIlqvNwZV3jTB6uPdUtaWIOeNmddi2poK/WvGs=";
136+ })
129137 ];
130138
131139 patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;