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

Commits on Nov 23, 2020

  1. linux-hardened: 5.8.x -> 5.9.x

    5.8.x is EOL which is kind of unfortunate for a hardened kernel.
    
    (cherry picked from commit 726d307)
    NeQuissimus authored and herrwiese committed Nov 23, 2020
    Copy the full SHA
    c65d36d View commit details

Commits on Nov 24, 2020

  1. Merge pull request #104720 from herrwiese/for-20.09/linux-hardened-5.9

    [20.09] linux-hardened: 5.8.x -> 5.9.x
    NeQuissimus authored Nov 24, 2020
    Copy the full SHA
    412cb04 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
Original file line number Diff line number Diff line change
@@ -17990,7 +17990,7 @@ in
# Hardened Linux
hardenedLinuxPackagesFor = kernel': overrides:
let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates:
linux_latest_for_hardened = pkgs.linux_5_8;
linux_latest_for_hardened = pkgs.linux_5_9;
kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides;
in linuxPackagesFor (kernel.override {
structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {