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

Commits on Apr 3, 2020

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

    @bkchr
    bkchr committed Apr 3, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    infinisil Silvan Mosberger
    GPG key ID: E8F1E9EAD284E17D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    644d643 View commit details

  2. Merge pull request #84173 from bkchr/bkchr-fix-wg-quick 

    Fix wg-quick after wireguard got upstreamed
    @rnhmjoj
    rnhmjoj authored Apr 3, 2020
    Copy the full SHA
    b483a67 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/services/networking/wg-quick.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.