sage: backport intermittent test fix#211725
Merged
collares merged 1 commit intoNixOS:masterfrom Jan 20, 2023
Merged
Conversation
ofborg
bot
added
10.rebuild-darwin: 0
omasanori
approved these changes
Jan 20, 2023
Contributor
omasanori
left a comment
omasanori
left a comment
There was a problem hiding this comment.
I have checked the upstream discussion for details. It looks okay to me.
Member
Author
|
Thanks @omasanori! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
Import the patch at https://git.sagemath.org/sage.git/patch?id2=9.8.beta6&id=6f5c1c2fc8bcfb5e6555716d05ce70511795ffa1 (https://trac.sagemath.org/ticket/33907) to reduce the number of intermittent CI failures such as https://hydra.nixos.org/log/fvawkwb4mjp7q4c4c5pfbxmi3jjh17wm-sage-tests-9.7.drv. This one is especially bad because it happens more often when the computer is under high load, which is likely to be the case on the builders.
Fixes #211696. Or, to be precise, helps get a successful build after #211390 fixed it.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes