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

Commits on Dec 17, 2020

  1. linux-rt_5_10: 5.10-rt17 -> 5.10.1-rt19

    @NeQuissimus
    NeQuissimus committed Dec 17, 2020
    Copy the full SHA
    08d67bb View commit details

  2. linux/hardened/patches/5.4: 5.4.83.a -> 5.4.84.a

    @NeQuissimus
    NeQuissimus committed Dec 17, 2020
    Copy the full SHA
    1eb7cd9 View commit details

  3. linux/hardened/patches/5.9: 5.9.14.a -> 5.9.15.a

    @NeQuissimus
    NeQuissimus committed Dec 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    62f5b92 View commit details
Showing with 9 additions and 9 deletions.
  1. +6 −6 pkgs/os-specific/linux/kernel/hardened/patches.json
  2. +3 −3 pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
12 changes: 6 additions & 6 deletions pkgs/os-specific/linux/kernel/hardened/patches.json
View file
Original file line number Diff line number Diff line change
@@ -10,13 +10,13 @@
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.163.a/linux-hardened-4.19.163.a.patch"
},
"5.4": {
"name": "linux-hardened-5.4.83.a.patch",
"sha256": "08srahgfzynv2bfd0ym6vgl1c0xjfqg6qvgzlq85y9pb7fain5yp",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.83.a/linux-hardened-5.4.83.a.patch"
"name": "linux-hardened-5.4.84.a.patch",
"sha256": "1pwij0bxgf61ahi6fa8qwrr85yhx92z4sif71kdgxkbwcw9qwyzs",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.84.a/linux-hardened-5.4.84.a.patch"
},
"5.9": {
"name": "linux-hardened-5.9.14.a.patch",
"sha256": "1rr61s9k7nmr27r4vkgpvvra7r8ksi6h6axf5kcbx7krbgdmwmfv",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.14.a/linux-hardened-5.9.14.a.patch"
"name": "linux-hardened-5.9.15.a.patch",
"sha256": "1iqkw4mnr1p9wzfmjy5lawc6cn9wvg05xsak24fzbp1i22h4dfz4",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.15.a/linux-hardened-5.9.15.a.patch"
}
}
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
, ... } @ args:

let
version = "5.10-rt17"; # updated by ./update-rt.sh
version = "5.10.1-rt19"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "0hyav21vzz5v1kgb455pcz9ncg5qqzxmp60na290scwq7vj9kpyw";
sha256 = "0p2fl7kl4ckphq17xir7n7vgrzlhbdqmyd2yyp4yilwvih9625pd";
};

kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0baf7363f6h3smr4lgw88dbpf4977j6c1asifyhc8zhd7100ckhn";
sha256 = "0hihi7p866alh03ziz8q1l0p3sxi437h4a45c5dlv9lrg6f177qb";
};
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;