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

nftables: fix substituted file location #309648

Merged
merged 1 commit into from
May 7, 2024

Conversation

Shawn8901
Copy link
Contributor

@Shawn8901 Shawn8901 commented May 6, 2024

Description of changes

When splitting out the python part of nftables it broke the substituteInPlace, as there is a setSourceRoot set.
So when patching, its already in the py folder.

That should unbreak pythonPackages.nftables and its dependants.

https://hydra.nixos.org/build/258436548

I just tried to build it and firewalld as dependency.

ZHF: #309482

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

Add a 👍 reaction to pull requests you find important.

@Shawn8901 Shawn8901 added the 0.kind: ZHF Fixes Fixes during the ZHF campaign label May 6, 2024
@Shawn8901
Copy link
Contributor Author

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

6 packages built:
  • firewalld
  • firewalld-gui
  • python311Packages.nftables
  • python311Packages.nftables.dist
  • python312Packages.nftables
  • python312Packages.nftables.dist

@ofborg ofborg bot requested review from Conni2461, dasJ and Izorkin May 6, 2024 21:15
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 labels May 6, 2024
@Mic92 Mic92 merged commit 1288bcc into NixOS:master May 7, 2024
27 of 29 checks passed
@Shawn8901 Shawn8901 deleted the fix_python_nftables branch May 7, 2024 04:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0.kind: ZHF Fixes Fixes during the ZHF campaign 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants