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

python310Packages.fe25519: remove patch leftover from merge #251733

Merged
merged 1 commit into from
Aug 27, 2023
Merged

python310Packages.fe25519: remove patch leftover from merge #251733

merged 1 commit into from
Aug 27, 2023

Conversation

tjni
Copy link
Contributor

@tjni tjni commented Aug 27, 2023

There is a silent merge conflict between #251649 and 7418b09, which shows up in staging-next (#250778).

Description of changes

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/)
  • 23.11 Release Notes (or backporting 23.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
  • Fits CONTRIBUTING.md.

@tjni
Copy link
Contributor Author

tjni commented Aug 27, 2023

@ofborg build python310Packages.fe25519 python311Packages.fe25519

@fabaff
Copy link
Member

fabaff commented Aug 27, 2023

Result of nixpkgs-review pr 251733 run on x86_64-linux 1

8 packages built:
  • python310Packages.fe25519
  • python310Packages.fe25519.dist
  • python310Packages.ge25519
  • python310Packages.ge25519.dist
  • python311Packages.fe25519
  • python311Packages.fe25519.dist
  • python311Packages.ge25519
  • python311Packages.ge25519.dist

@marsam marsam merged commit ee07e1f into NixOS:staging-next Aug 27, 2023
@tjni tjni deleted the merge-25519 branch August 27, 2023 16:44
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