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: 52577bac4ae9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 60c4ddb97fd5
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 9, 2020

  1. linuxPackagesFor: wireguard: noop for kernel >= 5.6 

    (cherry picked from commit 27ca6c2)

Rationale for backport: it's explicitly supported to build a kernel with
a custom tree. When using a 5.6 tree in a system configuration, eval
will break since `wireguard` is still evaluated and throws an
assertion-error on 5.6 or greater.
    @d-xo @Ma27
    d-xo authored and Ma27 committed Apr 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    ljharb Jordan Harband
    GPG key ID: 9F6A681E35EF8B56
    Verified
    Learn about vigilant mode
    Copy the full SHA
    60c4ddb View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/top-level/all-packages.nix
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -15958,7 +15958,7 @@ in
virtualbox = pkgs.virtualboxHardened;
};

wireguard = callPackage ../os-specific/linux/wireguard { };
wireguard = if lib.versionOlder kernel.version "5.6" then callPackage ../os-specific/linux/wireguard { } else null;

x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { };