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

python3Packages.ipykernel: fix build on darwin #80940

Merged
merged 1 commit into from Mar 3, 2020
Merged

python3Packages.ipykernel: fix build on darwin #80940

merged 1 commit into from Mar 3, 2020

Conversation

veprbl
Copy link
Member

@veprbl veprbl commented Feb 24, 2020

Motivation for this change
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 nixpkgs-review --run "nixpkgs-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.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Feb 24, 2020
@veprbl
Copy link
Member Author

veprbl commented Feb 24, 2020

@GrahamcOfBorg build python37Packages.ipykernel
@GrahamcOfBorg build python38Packages.ipykernel

LnL7
LnL7 approved these changes Feb 25, 2020
View reviewed changes
Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

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

Seems to build fine before for me however.

jonringer
jonringer reviewed Feb 25, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment •
edited

Choose a reason for hiding this comment

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

the 2 commits should probably be squashed

nixpkgs doesn't have a python3.4 interpreter, so the disable change is largely a "noop"

@veprbl
python3Packages.ipykernel: fix build on darwin
d35009e 
Also python34 is not supported:

ipython/ipykernel@979e6fd

nixpkgs doesn't provide python34 anymore, so pythonOlder "3.5" is always
true and can be removed.
@veprbl
Copy link
Member Author

veprbl commented Feb 26, 2020

the 2 commits should probably be squashed

Done!

nixpkgs doesn't have a python3.4 interpreter, so the disable change is largely a "noop"

Yes, I thought of it like more of a declaration. I updated the commit to remove the condition instead of updating it.

@jonringer
Copy link
Contributor

@GrahamcOfBorg build python3Packages.ipykernel
@GrahamcOfBorg build pythonPackages.ipykernel
@GrahamcOfBorg build python38Packages.ipykernel

@veprbl veprbl merged commit 344d914 into NixOS:master Mar 3, 2020
veprbl added a commit that referenced this pull request Mar 3, 2020
@veprbl
python3Packages.ipykernel: fix build on darwin
899cf4b 
Also python34 is not supported:

ipython/ipykernel@979e6fd

nixpkgs doesn't provide python34 anymore, so pythonOlder "3.5" is always
true and can be removed.

(cherry picked from commit d35009e)

cc #80940
@veprbl veprbl deleted the pr/ipykernel_darwin_fix2 branch March 3, 2020 17:52
@veprbl veprbl added the 8.has: port to stable A PR already has a backport to the stable release. label Mar 3, 2020
@veprbl veprbl restored the pr/ipykernel_darwin_fix2 branch December 1, 2020 16:46
@veprbl veprbl deleted the pr/ipykernel_darwin_fix2 branch December 1, 2020 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer left review comments

@LnL7 LnL7 LnL7 approved these changes

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: python 8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 11-100 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@veprbl @jonringer @LnL7