Navigation Menu

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.cytoolz: fix build #51663

Merged
merged 1 commit into from Dec 12, 2018
Merged

python3Packages.cytoolz: fix build #51663

merged 1 commit into from Dec 12, 2018

Conversation

erictapen
Copy link
Member

cytoolz has a test failure with Python 3.7. There is a debian patch for it, which didn't make it into upstream yet.

Motivation for this change

python3Packages.cytoolz does not build on master.

Things done

Apply the patch from debian.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@erictapen erictapen requested a review from FRidh as a code owner December 7, 2018 14:19
@dotlambda
Copy link
Member

This will conflict with b5cb0f0, even though your fix looks better.

@erictapen
Copy link
Member Author

@dotlambda Hoopsie, didn't see that commit! Also maybe I should have directed this PR to staging, didn't check how many packages would be affected. Would you find 10-100 rebuilds to be reasonable for master?

@erictapen
Copy link
Member Author

@GrahamcOfBorg build python3Packages.cytoolz

Mic92
Mic92 reviewed Dec 8, 2018
View reviewed changes
pkgs/development/python-modules/cytoolz/default.nix Outdated
# temporal fix for a test failure: https://github.com/pytoolz/cytoolz/issues/122
(fetchpatch {
name = "py37.patch";
url = "https://salsa.debian.org/python-team/modules/python-cytoolz/raw/master/debian/patches/py37.patch";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
url = "https://salsa.debian.org/python-team/modules/python-cytoolz/raw/master/debian/patches/py37.patch";
url = "https://salsa.debian.org/python-team/modules/python-cytoolz/raw/5ce4158deefc47475d1e76813f900e6c72ddcc6e/debian/patches/py37.patch";

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh of course! Fixed it.

Copy link
Member

Choose a reason for hiding this comment

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

You should also change the URL in the commit messsage.
And a minor nitpick: some people prefer using quotes-free URLs given this is a thing in Nix.

Copy link
Member Author

Choose a reason for hiding this comment

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

+1 fixed it

@erictapen erictapen force-pushed the cytoolz-fix-build branch 2 times, most recently from d428ec4 to 3854f88 Compare December 10, 2018 13:53
@erictapen
Copy link
Member Author

rebased to current master.

@worldofpeace
Copy link
Contributor

@GrahamcOfBorg build python3Packages.cytoolz python2Packages.cytoolz

@erictapen erictapen force-pushed the cytoolz-fix-build branch 2 times, most recently from 94cc8c3 to d3ef36d Compare December 11, 2018 15:04
@erictapen
python3Packages.cytoolz: fix build
df6010a 
cytoolz has a test failure with Python 3.7 [0]. There is a debian patch
for it, which didn't make it into upstream yet [1].

[0] pytoolz/cytoolz#122
[1] https://salsa.debian.org/python-team/modules/python-cytoolz/raw/5ce4158deefc47475d1e76813f900e6c72ddcc6e/debian/patches/py37.patch
@veprbl
Copy link
Member

veprbl commented Dec 12, 2018

@GrahamcOfBorg build python3Packages.cytoolz python2Packages.cytoolz

@worldofpeace worldofpeace merged commit d36846d into NixOS:master Dec 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@dotlambda dotlambda dotlambda left review comments

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: python 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
6 participants
@erictapen @dotlambda @worldofpeace @veprbl @Mic92 @GrahamcOfBorg