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

Commits on Jan 20, 2021

  1. linux: 5.10.8 -> 5.10.9 

    (cherry picked from commit 463f322)
    @NeQuissimus
    NeQuissimus committed Jan 20, 2021
    Copy the full SHA
    a33504e View commit details

  2. linux/hardened/patches/5.10: 5.10.8.a -> 5.10.9.a 

    (cherry picked from commit 3df0e82)
    @NeQuissimus
    NeQuissimus committed Jan 20, 2021
    Copy the full SHA
    f7b9868 View commit details
Showing with 5 additions and 5 deletions.
  1. +3 −3 pkgs/os-specific/linux/kernel/hardened/patches.json
  2. +2 −2 pkgs/os-specific/linux/kernel/linux-5.10.nix
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/kernel/hardened/patches.json
View file
Original file line number Diff line number Diff line change
@@ -13,9 +13,9 @@
},
"5.10": {
"extra": ".a",
"name": "linux-hardened-5.10.8.a.patch",
"sha256": "1nqn50c6g7j7ljdq7y50y6kgmilc5mb266lg6z6kz0cqpn2qaxxx",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.8.a/linux-hardened-5.10.8.a.patch"
"name": "linux-hardened-5.10.9.a.patch",
"sha256": "0mkwyknafdbc2hqv4j7jjc6wsrrx6a76d69hxh7x90gi0s3f5rfw",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.9.a/linux-hardened-5.10.9.a.patch"
},
"5.4": {
"extra": ".a",
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.10.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.10.8";
version = "5.10.9";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1v83wm8xbhq1sgn7c84zi7l40vmd9k1gb653b686jp8n4na85z2w";
sha256 = "0la7dklpy6xd79fkzavpmlfyrc60kmmwz491msd95dmvv06kwwvz";
};
} // (args.argsOverride or {}))