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: 1c32029731f5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ef33b9fc089a
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 3, 2020

  1. fix wireguard service as well after it got upstreamed. 

    (cherry picked from commit 50fb52d)
    @ikervagyok @rnhmjoj
    ikervagyok authored and rnhmjoj committed Apr 3, 2020
    Copy the full SHA
    8224137 View commit details

  2. nixos/wg-quick: Fix after wireguard got upstreamed 

    (cherry picked from commit 644d643)
    @bkchr @rnhmjoj
    bkchr authored and rnhmjoj committed Apr 3, 2020
    Copy the full SHA
    ef33b9f View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 nixos/modules/services/networking/wg-quick.nix
  2. +1 −1 nixos/modules/services/networking/wireguard.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/networking/wg-quick.nix
View file
Original file line number Diff line number Diff line change
@@ -302,7 +302,7 @@ in {
###### implementation

config = mkIf (cfg.interfaces != {}) {
boot.extraModulePackages = [ kernel.wireguard ];
boot.extraModulePackages = optional (versionOlder kernel.kernel.version "5.6") kernel.wireguard;
environment.systemPackages = [ pkgs.wireguard-tools ];
# This is forced to false for now because the default "--validmark" rpfilter we apply on reverse path filtering
# breaks the wg-quick routing because wireguard packets leave with a fwmark from wireguard.
2 changes: 1 addition & 1 deletion nixos/modules/services/networking/wireguard.nix
View file
Original file line number Diff line number Diff line change
@@ -435,7 +435,7 @@ in
message = "networking.wireguard.interfaces.${interfaceName} peer «${peer.publicKey}» has both presharedKey and presharedKeyFile set, but only one can be used.";
}) all_peers;

boot.extraModulePackages = [ kernel.wireguard ];
boot.extraModulePackages = optional (versionOlder kernel.kernel.version "5.6") kernel.wireguard;
environment.systemPackages = [ pkgs.wireguard-tools ];

systemd.services =