From 5fc5881221bc7e301adecf7eeae76c392cec9714 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 17 Mar 2019 14:36:01 +0000 Subject: [PATCH] sage: backport bugfix (#57794) --- pkgs/applications/science/math/sage/sage-src.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 51a83d70415b..dd51059ff01b 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -61,6 +61,19 @@ stdenv.mkDerivation rec { }) ]; + # Since sage unfortunately does not release bugfix releases, packagers must + # fix those bugs themselves. This is for critical bugfixes, where "critical" + # == "causes (transient) doctest failures / somebody complained". + bugfixPatches = [ + # Transient doctest failure in src/sage/modular/abvar/torsion_subgroup.py + # https://trac.sagemath.org/ticket/27477 + (fetchpatch { + name = "sig_on_in_matrix_sparce.patch"; + url = "https://git.sagemath.org/sage.git/patch?id2=10407524b18659e14e184114b61c043fb816f3c2&id=c9b0cc9d0b8748ab85e568f8f57f316c5e8cbe54"; + sha256 = "0wgp7yvn9sm1ynlhcr4l0hzmvr2n28llg4xc01p6k1zz4im64c17"; + }) + ]; + # Patches needed because of package updates. We could just pin the versions of # dependencies, but that would lead to rebuilds, confusion and the burdons of # maintaining multiple versions of dependencies. Instead we try to make sage @@ -126,7 +139,7 @@ stdenv.mkDerivation rec { ./patches/ignore-pip-deprecation.patch ]; - patches = nixPatches ++ packageUpgradePatches; + patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; postPatch = '' # make sure shebangs etc are fixed, but sage-python23 still works