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

p11-kit: add darwin tls ca store path #194844

Merged
merged 1 commit into from
Oct 12, 2022

Conversation

lilyinstarlight
Copy link
Member

Description of changes

Allows p11-kit to correctly find the root CA store on macOS. This is relevant when building something like curl with NSS and are intending to use libnssckbi (p11-trust-kit) for the CA store (like the curl-impersonate-ff derivation from #194310)

I tested this in GitHub Actions (since I don't have a Mac) and this patch allowed curl-impersonate-ff to work correctly

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@lilyinstarlight
Copy link
Member Author

@rnhmjoj, any chance this could be merged before the next staging cycle starts or do you want someone else to give it an additional review first?

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Oct 12, 2022

I was giving some time for others to review, but it been a while and this change should be completely harmless.
Let's merge this.

@rnhmjoj rnhmjoj merged commit fd4c573 into NixOS:staging Oct 12, 2022
@lilyinstarlight lilyinstarlight deleted the fix/p11-kit-macos branch October 12, 2022 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants