diff options
author | Mauricio Collares <244239+collares@users.noreply.github.com> | 2021-11-20 20:13:07 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-20 20:13:07 -0300 |
commit | 1ee4cb8d9341d52d36e0fb954f69e7669d1f8e8c (patch) | |
tree | b01631774472e21b1f6dcdeb20cf09cf54469a56 /pkgs/applications/science/math | |
parent | dc2cad8150551fe842ddc87a1d704b0de2267b9a (diff) | |
download | nixpkgs-1ee4cb8d9341d52d36e0fb954f69e7669d1f8e8c.tar nixpkgs-1ee4cb8d9341d52d36e0fb954f69e7669d1f8e8c.tar.gz nixpkgs-1ee4cb8d9341d52d36e0fb954f69e7669d1f8e8c.tar.bz2 nixpkgs-1ee4cb8d9341d52d36e0fb954f69e7669d1f8e8c.tar.lz nixpkgs-1ee4cb8d9341d52d36e0fb954f69e7669d1f8e8c.tar.xz nixpkgs-1ee4cb8d9341d52d36e0fb954f69e7669d1f8e8c.tar.zst nixpkgs-1ee4cb8d9341d52d36e0fb954f69e7669d1f8e8c.zip |
sage: patch test so that new pari warning doesn't cause failures (#4)
Diffstat (limited to 'pkgs/applications/science/math')
-rw-r--r-- | pkgs/applications/science/math/sage/sage-src.nix | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index ed10121e5cd..4a912e002d9 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -23,6 +23,12 @@ let # branches (wip patches from tickets), but exports each commit as a separate # patch, so merge commits can lead to conflicts. Used if squashed == false. # + # The above is the preferred option. To use it, find a Trac ticket and pass the + # "Commit" field from the ticket as "rev", choosing "base" as an appropriate + # release tag, i.e. a tag that doesn't cause the patch to include a lot of + # unrelated changes. If there is no such tag (due to nonlinear history, for + # example), there are two other options, listed below. + # # 2) From GitHub's sagemath/sage repo. This lets us use a GH feature that allows # us to choose between a .patch file, with one patch per commit, or a .diff file, # which squashes all commits into a single diff. This is used if squashed == @@ -118,6 +124,14 @@ stdenv.mkDerivation rec { rev = "beed4e16aff32e47d0c3b1c58cb1e2f4c38590f8"; sha256 = "sha256-3eJPfWfCrCAQ5filIn7FbzjRQeO9QyTIVl/HyRuqFtE="; }) + + # https://trac.sagemath.org/ticket/32797 + (fetchSageDiff { + base = "9.5.beta7"; + name = "pari-2.13.3-update.patch"; + rev = "f5f7a86908daf60b25e66e6a189c51ada7e0a732"; + sha256 = "sha256-H/caGx3q4KcdsyGe+ojV9bUTQ5y0siqM+QHgDbeEnbw="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; |