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

gnupg: unbreak builds without tpm2-tss #189819

Merged
merged 1 commit into from Oct 3, 2022
Merged

gnupg: unbreak builds without tpm2-tss #189819

merged 1 commit into from Oct 3, 2022

Conversation

ghost
Copy link

@ghost ghost commented Sep 5, 2022

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • powerpc64le-linux
  • 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.

Builds without tpm2-tss no longer seem to work after #183753. This PR fixes
that.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Sep 5, 2022
@SuperSandro2000
Copy link
Member

Can you please rebase on master?

@ghost ghost marked this pull request as draft October 1, 2022 23:43
@ghost
Copy link
Author

ghost commented Oct 1, 2022

Can you please rebase on master?

Done. Is there some way I can get notified when my PRs become merge-conflicted?

@ghost ghost marked this pull request as ready for review October 1, 2022 23:44
@ghost ghost marked this pull request as draft October 1, 2022 23:45
Builds without tpm2-tss no longer seem to work after #183753.  This PR fixes
that.
@ghost ghost marked this pull request as ready for review October 1, 2022 23:48
@SuperSandro2000
Copy link
Member

Done. Is there some way I can get notified when my PRs become merge-conflicted?

I don't think so.

@SuperSandro2000 SuperSandro2000 merged commit 9db45eb into NixOS:master Oct 3, 2022
@ghost ghost deleted the pr/unbreak/gnupg/tpm branch October 3, 2022 21:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant