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

[20.03] pythonPackages.pyscard: Fix build on Darwin #97980

Merged
merged 1 commit into from Sep 14, 2020
Merged

[20.03] pythonPackages.pyscard: Fix build on Darwin #97980

merged 1 commit into from Sep 14, 2020

Conversation

risicle
Copy link
Contributor

@risicle risicle commented Sep 14, 2020

Motivation for this change

Backport of #91717

Tested macos 10.14.

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.

@kevingriffin @risicle
pythonPackages.pyscard: Fix build on Darwin
13d38bf 
The previously provided patch is still necessary,
as nix python reports an old version of macOS
that has the bug, when in fact modern macOS
does not have the misspelling.

The patch has been upstreamed, so we take it
to fix 1.9.9 in anticipation of the next release.

(cherry picked from commit 44fd570)
@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 6.topic: python labels Sep 14, 2020
@ofborg ofborg bot requested a review from layus September 14, 2020 15:15
layus
layus approved these changes Sep 14, 2020
View reviewed changes
Copy link
Member

@layus layus left a comment

Choose a reason for hiding this comment

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

As a backport it looks good to me.
That being said, I cannot test darwin here.

@risicle risicle merged commit 3709ab3 into NixOS:release-20.03 Sep 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@layus layus layus approved these changes

@FRidh FRidh Awaiting requested review from FRidh FRidh is a code owner

@jonringer jonringer Awaiting requested review from jonringer jonringer is a code owner

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@risicle @layus @kevingriffin