Skip to content

nixos: fix ip46tables invocation in nat#75681

Merged
worldofpeace merged 1 commit intoNixOS:masterfrom
lovesegfault:nixos-fix-nat
Dec 15, 2019
Merged

nixos: fix ip46tables invocation in nat#75681
worldofpeace merged 1 commit intoNixOS:masterfrom
lovesegfault:nixos-fix-nat

Conversation

@lovesegfault
Copy link
Member

@lovesegfault lovesegfault commented Dec 15, 2019 •
edited
Loading

Motivation for this change

This fixes the current failure in Hydra that was introduced in 3e792fb.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @cleverca22 @volth @worldofpeace

@worldofpeace
Copy link
Contributor

worldofpeace commented Dec 15, 2019

@lovesegfault I think you meant to ping @cleverca22 😄

@worldofpeace
Copy link
Contributor

worldofpeace commented Dec 15, 2019

@GrahamcOfBorg test nat.standalone

@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Dec 15, 2019
@lovesegfault
Copy link
Member Author

lovesegfault commented Dec 15, 2019

@worldofpeace Oops, yes 😆. Fixed :)

@worldofpeace
Copy link
Contributor

worldofpeace commented Dec 15, 2019

Reported failing test is https://hydra.nixos.org/build/108241462

@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 Dec 15, 2019
@lovesegfault
Copy link
Member Author

lovesegfault commented Dec 15, 2019

@worldofpeace SHIP IT

worldofpeace
worldofpeace approved these changes Dec 15, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@worldofpeace
Copy link
Contributor

worldofpeace commented Dec 15, 2019

Going quick because it's a channel blocker.

@worldofpeace worldofpeace merged commit 18571d6 into NixOS:master Dec 15, 2019
@lovesegfault lovesegfault deleted the nixos-fix-nat branch April 7, 2020 07:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@worldofpeace worldofpeace worldofpeace approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@lovesegfault @worldofpeace