diff --git a/pkgs/applications/science/math/sage/patches/disable-slow-glpk-test.patch b/pkgs/applications/science/math/sage/patches/disable-slow-glpk-test.patch deleted file mode 100644 index 89f0613589d4..000000000000 --- a/pkgs/applications/science/math/sage/patches/disable-slow-glpk-test.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/sage/graphs/generic_graph.py b/src/sage/graphs/generic_graph.py -index 2deb533f7f..663ff2cd13 100644 ---- a/src/sage/graphs/generic_graph.py -+++ b/src/sage/graphs/generic_graph.py -@@ -6953,12 +6953,6 @@ class GenericGraph(GenericGraph_pyx): - sage: G = DiGraph(d6, format='dig6') - sage: G.edge_connectivity() - 5 -- sage: G.edge_disjoint_spanning_trees(5) # long time # needs sage.numerical.mip -- [Digraph on 28 vertices, -- Digraph on 28 vertices, -- Digraph on 28 vertices, -- Digraph on 28 vertices, -- Digraph on 28 vertices] - - Small cases:: - diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index b8d9e3e903a6..bfdd925a7352 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -54,13 +54,12 @@ stdenv.mkDerivation rec { # fix those bugs themselves. This is for critical bugfixes, where "critical" # == "causes (transient) doctest failures / somebody complained". bugfixPatches = [ - # Sage uses mixed integer programs (MIPs) to find edge disjoint - # spanning trees. For some reason, aarch64 glpk takes much longer - # than x86_64 glpk to solve such MIPs. Since the MIP formulation - # has "numerous problems" and will be replaced by a polynomial - # algorithm soon, disable this test for now. - # https://github.com/sagemath/sage/issues/34575 - ./patches/disable-slow-glpk-test.patch + # https://github.com/sagemath/sage/pull/38851, landed in 10.5.beta8 + (fetchpatch { + name = "glpk-aarch64-hang-workaround.patch"; + url = "https://github.com/sagemath/sage/commit/ce4a78dcb4178f85273619cea076c97345977ee1.diff"; + hash = "sha256-TibTx5llkXjkEZB/MDy4hfGwKBmwtitEpWP6K/ykke0="; + }) # compile libs/gap/element.pyx with -O1 # a more conservative version of https://github.com/sagemath/sage/pull/37951