Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pari: Make pthread optional, remove unstable #39377

Merged
merged 1 commit into from Apr 24, 2018

Conversation

timokau
Copy link
Member

@timokau timokau commented Apr 23, 2018

Motivation for this change
  • make pthread optional because sage expects threading to be disabled and threading is disabled by default upstream
  • remove unstable. Upstream apparently doesn't update unstable anymore and its already older than stable. Sage uses a git version of pari and I currently do that with an override, but I'm not sure whether or not that git version should be exposed outside of sage (@7c6f434c)
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@@ -15,10 +17,10 @@ stdenv.mkDerivation rec {

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can probably make libpthreadstubs optional as well

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right

@7c6f434c
Copy link
Member

I don't use Pari/GP directly… intuitively maybe no, given that the Git revision is chosen based on Sage needs, not on some policy that only refers to Pari/GP development itself.

@timokau
Copy link
Member Author

timokau commented Apr 24, 2018

Yeah I agree. Hopefully they'll switch back to stable releases anyways.

@7c6f434c
Copy link
Member

I hope I don't forget to come back and merge…

@matthewbauer matthewbauer merged commit d57e646 into NixOS:master Apr 24, 2018
@matthewbauer
Copy link
Member

Looks good! If you're not already, make sure you are checking Hydra jobs. This has much more extensive testing than done in PRs and occasionally we will pick up an unexpected failure:

https://hydra.nixos.org/jobset/nixos/trunk-combined

@timokau
Copy link
Member Author

timokau commented Apr 24, 2018

@matthewbauer I am to a certain extend (mostly only when hydra notifies me about stuff I maintain). But as long as we have hundreds of failing jobs, I don't think its a very useful indicator of which update broke something.

@matthewbauer
Copy link
Member

Yeah definitely. I just know some new contributors are not aware of Hydra so I wanted to mention it. I mainly check the "newly failing jobs" tab.

@timokau timokau deleted the pari-pthread branch April 25, 2018 10:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants