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

Commits on Feb 17, 2021

  1. linux: 4.19.175 -> 4.19.176

    @NeQuissimus
    NeQuissimus committed Feb 17, 2021
    Copy the full SHA
    e64ac44 View commit details

  2. linux: 5.10.16 -> 5.10.17

    @NeQuissimus
    NeQuissimus committed Feb 17, 2021
    Copy the full SHA
    f4174c5 View commit details

  3. linux: 5.4.97 -> 5.4.99

    @NeQuissimus
    NeQuissimus committed Feb 17, 2021
    Copy the full SHA
    fd59bee View commit details

  4. linux-rt_5_10: 5.10.12-rt26 -> 5.10.16-rt30

    @NeQuissimus
    NeQuissimus committed Feb 17, 2021
    Copy the full SHA
    a770528 View commit details

  5. linux/hardened/patches/4.19: 4.19.175-hardened1 -> 4.19.176-hardened1

    @NeQuissimus
    NeQuissimus committed Feb 17, 2021
    Copy the full SHA
    6b9c808 View commit details

  6. linux/hardened/patches/5.10: 5.10.15-hardened1 -> 5.10.16-hardened1

    @NeQuissimus
    NeQuissimus committed Feb 17, 2021
    Copy the full SHA
    d770938 View commit details

  7. linux/hardened/patches/5.4: 5.4.97-hardened1 -> 5.4.98-hardened1

    @NeQuissimus
    NeQuissimus committed Feb 17, 2021
    Copy the full SHA
    e9ac606 View commit details
18 changes: 9 additions & 9 deletions pkgs/os-specific/linux/kernel/hardened/patches.json
View file
Original file line number Diff line number Diff line change
@@ -7,20 +7,20 @@
},
"4.19": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.175-hardened1.patch",
"sha256": "04pflpzb8fs2wlx2sm46r1lxn4vcmhsygzk088m8rg3jjygany3i",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.175-hardened1/linux-hardened-4.19.175-hardened1.patch"
"name": "linux-hardened-4.19.176-hardened1.patch",
"sha256": "0h6jv38n98dp395hs9s29yszbr9zj7rwiv9hny82nffllw6d3vxk",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.176-hardened1/linux-hardened-4.19.176-hardened1.patch"
},
"5.10": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.15-hardened1.patch",
"sha256": "1xd0qr58lz38swivhrbhjf1jz3y8y4i9ba1qcij7bydw125qvz14",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.15-hardened1/linux-hardened-5.10.15-hardened1.patch"
"name": "linux-hardened-5.10.16-hardened1.patch",
"sha256": "0qd38hrc5qhm1gkk7rdlsf897cw7srs0ibz3xqdbl2zvwxrk1f1w",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.16-hardened1/linux-hardened-5.10.16-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.97-hardened1.patch",
"sha256": "1610lgvxxx6rmbi38q3pcaf9kcw8fqxspwmg2irgmvvzniv5p42x",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.97-hardened1/linux-hardened-5.4.97-hardened1.patch"
"name": "linux-hardened-5.4.98-hardened1.patch",
"sha256": "0nwj49rb87agkbsv9qfi8wc6mv31a40zdbvl2wp316qxhb1d5n9c",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.98-hardened1/linux-hardened-5.4.98-hardened1.patch"
}
}
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with lib;

buildLinux (args // rec {
version = "4.19.175";
version = "4.19.176";

# 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/v4.x/linux-${version}.tar.xz";
sha256 = "099b3dw9rj2z147dpjppd57g24paxw8x4fq1ir1ss5ibzy24pvnc";
sha256 = "0wv0hb25c5jgw6h3zwbb24mfnn19yr0sgcmk1g2xa6x33g9bihz1";
};
} // (args.argsOverride or {}))
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 lib;

buildLinux (args // rec {
version = "5.10.16";
version = "5.10.17";

# 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 = "0dqa40yd1yf488pd5vv8c30wsnqazykv7lvi6lmwgz1v4zmf6vsk";
sha256 = "05289lr531piv1ncisbazfk0lj0q7gxflqkb0bn4c95vx0y64kp8";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.4.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with lib;

buildLinux (args // rec {
version = "5.4.97";
version = "5.4.99";

# 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 = "0gs856v3q3m0q245mf8b9ivds8dizqrgjw27s9kbq3v31886da3i";
sha256 = "09qs6nqzq7hsaq928jvbri4nfjm0m6rf0lfx6vc30g95d4nd3njv";
};
} // (args.argsOverride or {}))
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.12-rt26"; # updated by ./update-rt.sh
version = "5.10.16-rt30"; # 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 = "1an460q3affd7gmd6fqv8g37j3z2fnmq19iy677k8kxb2wl4yi8x";
sha256 = "0dqa40yd1yf488pd5vv8c30wsnqazykv7lvi6lmwgz1v4zmf6vsk";
};

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