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.

Sign up for GitHub

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

pythonPackages.magic-wormhole: patch the call to 'locale' #35388

Merged
merged 1 commit into from Feb 27, 2018
Merged

pythonPackages.magic-wormhole: patch the call to 'locale' #35388

merged 1 commit into from Feb 27, 2018

Conversation

andrew-d
Copy link
Contributor

Motivation for this change

As it says in the comment, this ensures we can build magic-wormhole on Linux, where we already have a locale binary.

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.

cc @asymmetric (maintainer)
cc @risicle (removed the previous comment)

@andrew-d andrew-d requested a review from FRidh as a code owner February 23, 2018 09:29
@dotlambda
Copy link
Member

We should first merge #35175

@andrew-d
Copy link
Contributor Author

We should first merge #35175

Yep, fine with me! I've worked around this now with a patch on my personal nixpkgs fork, so no immediate urgency 👍

@dotlambda
Copy link
Member

@andrew-d Can you please rebase on master?

@andrew-d andrew-d force-pushed the adunham/magic-wormhole-locale branch from 3e2cfc3 to 9170269 Compare February 27, 2018 08:08
@andrew-d
Copy link
Contributor Author

@dotlambda - Done!

@dotlambda
Copy link
Member

@FRidh Wouldn't it be enough to add glibc to propagatedBuildInputs in this case?

@FRidh
Copy link
Member

FRidh commented Feb 27, 2018

  • propagatedBuildInputs should typically be avoided
  • in python the wrappers currently consider the propagatedBuildInputs and add their /bin to PATH. While this works, and is currently the solution, we should eventually get rid of it.

@dotlambda
Copy link
Member

Okay, then this looks like the best solution.

@dotlambda
Copy link
Member

@GrahamcOfBorg build python2.pkgs.magic-wormhole python3.pkgs.magic-wormhole

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

wormhole.test.test_cli.PregeneratedCode.test_slow_text
wormhole.test.test_cli.PregeneratedCode.test_text
wormhole.test.test_cli.PregeneratedCode.test_text_subprocess
wormhole.test.test_cli.PregeneratedCode.test_text_tor
-------------------------------------------------------------------------------
Ran 355 tests in 17.447s

PASSED (skips=20, successes=335)
/nix/store/541hpvpmq9rjrlivy2i02kmw9njfk2ss-python2.7-magic-wormhole-0.10.5
/nix/store/ksg1w1qf3b21ggjlhlankh6aixqd4vn8-python3.6-magic-wormhole-0.10.5

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

wormhole.test.test_cli.PregeneratedCode.test_slow_text
wormhole.test.test_cli.PregeneratedCode.test_text
wormhole.test.test_cli.PregeneratedCode.test_text_subprocess
wormhole.test.test_cli.PregeneratedCode.test_text_tor
-------------------------------------------------------------------------------
Ran 355 tests in 36.169s

PASSED (skips=20, successes=335)
/nix/store/sg3ymwyvzbd0b0cw60y9zc7h28s70xjp-python2.7-magic-wormhole-0.10.5
/nix/store/l8kdhy4l7vrvik5k5fmnw0zni1jvapbv-python3.6-magic-wormhole-0.10.5

@dotlambda dotlambda merged commit 97cc03d into NixOS:master Feb 27, 2018
@andrew-d andrew-d deleted the adunham/magic-wormhole-locale branch February 27, 2018 13:54
@andrew-d
Copy link
Contributor Author

@dotlambda - Thank you very much!

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

Assignees
No one assigned
Labels
6.topic: python 8.has: clean-up 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@andrew-d @dotlambda @FRidh @GrahamcOfBorg