Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 94941cb0455b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b6f05ca54de9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 11, 2017

  1. nftables: drop services prefix in an error message

    @lukateras
    lukateras authored Jul 11, 2017
    Copy the full SHA
    f2c0e09 View commit details

Commits on Jul 12, 2017

  1. Merge pull request #27316 from yegortimoshenko/patch-1 

    nftables: drop services prefix in an error message
    @Mic92
    Mic92 authored Jul 12, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b6f05ca View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/services/networking/nftables.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/networking/nftables.nix
View file
Original file line number Diff line number Diff line change
@@ -99,7 +99,7 @@ in
config = mkIf cfg.enable {
assertions = [{
assertion = config.networking.firewall.enable == false;
message = "You can not use nftables with services.networking.firewall.";
message = "You can not use nftables with networking.firewall.";
}];
boot.blacklistedKernelModules = [ "ip_tables" ];
environment.systemPackages = [ pkgs.nftables ];