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

Jump to bottom

Fix sage dependencies #72357

Merged
merged 2 commits into from Nov 2, 2019
Merged

Fix sage dependencies #72357

merged 2 commits into from Nov 2, 2019

Conversation

timokau
Copy link
Member

@timokau timokau commented Oct 31, 2019

Motivation for this change

Two recent commits, ad53cf0 and 0ccf10b, broke dependencies that are needed for the sage build. Both look like they can be reverted without negative consequences. I think the first one was made by mistake (probably some automation issue, cc @FRidh), while the second one was premature (cc @jonringer).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@timokau
Revert "pythonPackages.ipython: remove python2 frozen package"
f727b6e 
This reverts commit 0ccf10b.

I think it was premature to drop the support a couple of weeks before
the official deadline. At least sage still depends on it.
@timokau
Revert "python: notebook: 5.7.8 -> 6.0.1"
039cb11 
This reverts commit ad53cf0.

I think this commit must have been by mistake. It updates the version of
notebook that was supposed to pin to an old, py2 compatible version.
@FRidh
Copy link
Member

FRidh commented Oct 31, 2019

Thank you. I thought I had removed the commit but apparently not.

I need to implement a way to prevent certain packages from being (automatically) updated because this is getting really annoying for everyone involved.

@ofborg ofborg bot requested review from LnL7 and bjornfor October 31, 2019 10:31
@jonringer
Copy link
Contributor

jonringer commented Oct 31, 2019 •
edited

It probably was premature, the update script did this to a fair number of packages, and I was thinking more about the python2 EOL, than maintaining python2 support.

@jonringer
Copy link
Contributor

for the update script, one possible solution is to only apply the bumps if the basename of the path is "default.nix", other variations are likely meant to not be bumped

@jonringer
Copy link
Contributor

@GrahamcOfBorg build sage

@timokau
Copy link
Member Author

timokau commented Nov 2, 2019

Unfortunately there are still some other issues that I'm currently tracking down. The recent python updates had an unusually big fallout.

I think this is good to be merged anyhow, since it at least fixes the sagelib build (although not the testsuite).

@FRidh FRidh merged commit b5ac99f into NixOS:master Nov 2, 2019
@timokau timokau deleted the sage-fix-dependencies branch November 2, 2019 11:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@LnL7 LnL7 Awaiting requested review from LnL7

@bjornfor bjornfor Awaiting requested review from bjornfor

Assignees
No one assigned
Labels
6.topic: python 8.has: package (new) 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@timokau @FRidh @jonringer