Skip to content

python310Packages.fe25519: remove patch leftover from merge#251733

Merged
marsam merged 1 commit intoNixOS:staging-nextfrom
tjni:merge-25519
Aug 27, 2023
Merged

python310Packages.fe25519: remove patch leftover from merge#251733
marsam merged 1 commit intoNixOS:staging-nextfrom
tjni:merge-25519

Conversation

@tjni
Copy link
Copy Markdown
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.

@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Aug 27, 2023
@tjni
Copy link
Copy Markdown
Contributor Author

tjni commented Aug 27, 2023

@ofborg build python310Packages.fe25519 python311Packages.fe25519

@ofborg ofborg bot requested a review from fabaff August 27, 2023 09:10
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Aug 27, 2023
@fabaff
Copy link
Copy Markdown
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

Labels

6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants