Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 25 additions & 35 deletions pkgs/os-specific/linux/kernel/hardened/patches.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,61 +2,51 @@
"4.14": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.14.255-hardened1.patch",
"sha256": "0d84jwf9vd86qzxq8aqcyrzmwczf3qh2f7a801qsgzb96fyvakrl",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.255-hardened1/linux-hardened-4.14.255-hardened1.patch"
"name": "linux-hardened-4.14.256-hardened1.patch",
"sha256": "0dxp40jq9xwrc8v81yyiy6vachqdwlviws152yzinh0k3j4s1c3g",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.256-hardened1/linux-hardened-4.14.256-hardened1.patch"
},
"sha256": "1mxjwqijnlvrdbpd973kdycz1dwklfkj9vpnj1cihgsf880q02zh",
"version": "4.14.255"
"sha256": "180s2zmkfxk7af9nnkmfi2cs56af6vwyd21hjcfdxiygjm7j114p",
"version": "4.14.256"
},
"4.19": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.217-hardened1.patch",
"sha256": "1brx4dvh8acq1r5mbh2a5d95k3n7m4x3jnqnp0s69p3fx9gf1kxh",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.217-hardened1/linux-hardened-4.19.217-hardened1.patch"
"name": "linux-hardened-4.19.219-hardened1.patch",
"sha256": "0447km2z1ww6yzixln1a3b7ymrj3ymxag7ny1d60d0d5064id6vj",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.219-hardened1/linux-hardened-4.19.219-hardened1.patch"
},
"sha256": "01500jcjvhbkn7xcan564jw0nnwc12cf8hhvl8118jqqqw612lc5",
"version": "4.19.217"
"sha256": "1nq9228zm24d8azvv6d6r5iw8lfkb7z5lblyhk137mydzdqwsklg",
"version": "4.19.219"
},
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.80-hardened1.patch",
"sha256": "1srm1kwh1fhc1rm7hwwyki48x1b4nq2zishscamsb82drnwl5pbs",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.80-hardened1/linux-hardened-5.10.80-hardened1.patch"
"name": "linux-hardened-5.10.83-hardened1.patch",
"sha256": "1ipx6ad7n2lzlrr02fk2qif5ac2mqpis0qghvms95dd3lpi4lj5r",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.83-hardened1/linux-hardened-5.10.83-hardened1.patch"
},
"sha256": "0ffvgxaq2ipylzavvgnnqk56pw2a6gy5zhhgdhsf8qs2cbvyhz27",
"version": "5.10.80"
},
"5.14": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.14.20-hardened1.patch",
"sha256": "0bnbwcayfcijgchnhyig9g9q334f4x1hwqns1zwg0wnsi3kxvcsb",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.20-hardened1/linux-hardened-5.14.20-hardened1.patch"
},
"sha256": "0icb14xmwijcamqbnj3v16cl1awmjzhg9cniw5gwwk6la1d7aiwj",
"version": "5.14.20"
"sha256": "0w4vq8wby3m9f5ryssh6z948m6zj1bjz9x432805dnrxyd1rl9gg",
"version": "5.10.83"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.3-hardened1.patch",
"sha256": "13d78f159bhd6f1fikrnf5madrfg9zrgg4zcmnjzmb1db1irh53n",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.3-hardened1/linux-hardened-5.15.3-hardened1.patch"
"name": "linux-hardened-5.15.6-hardened1.patch",
"sha256": "1ndj0dsxpailr12pp5kg8qqsvrmcdkhzlnxarl1jsp6c70g051r1",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.6-hardened1/linux-hardened-5.15.6-hardened1.patch"
},
"sha256": "1rh5zkany0gxwha74l8ivb2psykp236h8q56plas7dc7hghxmwx9",
"version": "5.15.3"
"sha256": "1w0plw9rzk2c0g8yxzwj7c6wkq538sy56mx1skmf58wrl83bmsdk",
"version": "5.15.6"
},
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.160-hardened1.patch",
"sha256": "06f7qnc21miz5yjrws3kbavj3v6ir8z3m87ljpnq55y6b73bxngy",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.160-hardened1/linux-hardened-5.4.160-hardened1.patch"
"name": "linux-hardened-5.4.163-hardened1.patch",
"sha256": "1yybid435c466grsfx53iax5x0b1ycz7a02ymx9r85gixp6qd3bp",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.163-hardened1/linux-hardened-5.4.163-hardened1.patch"
},
"sha256": "0n04nlg44l7p855lxkdz80x2avwm1pmrx1761cjmqv4w1qlq1c6l",
"version": "5.4.160"
"sha256": "1glh0azkrqdwydvbz9rp3czc5ppb72gq7svl3zbkjc6qfqbzwik2",
"version": "5.4.163"
}
}
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.14.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
with lib;

buildLinux (args // rec {
version = "4.14.255";
version = "4.14.256";

# 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;
Expand All @@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1mxjwqijnlvrdbpd973kdycz1dwklfkj9vpnj1cihgsf880q02zh";
sha256 = "180s2zmkfxk7af9nnkmfi2cs56af6vwyd21hjcfdxiygjm7j114p";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
with lib;

buildLinux (args // rec {
version = "4.19.217";
version = "4.19.219";

# 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;
Expand All @@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "01500jcjvhbkn7xcan564jw0nnwc12cf8hhvl8118jqqqw612lc5";
sha256 = "1nq9228zm24d8azvv6d6r5iw8lfkb7z5lblyhk137mydzdqwsklg";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.4.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:

buildLinux (args // rec {
version = "4.4.292";
version = "4.4.293";
extraMeta.branch = "4.4";
extraMeta.broken = stdenv.isAarch64;

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0v5rz8na1d458grc49x3j1951mhvxvqzjq5g9rv1hi0p9rjala97";
sha256 = "1z9hc68v8fvph29l2w3md4734hhgp36sy8mzdlkmdrlkjihq6bvd";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.9.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:

buildLinux (args // rec {
version = "4.9.290";
version = "4.9.291";
extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64;

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1ns0xbcgv0ix4b3xkcws8g3ks1a31kzc5whmkf9arz1k8si5mpnd";
sha256 = "0lwb9mb4s6qnwklygvfsr5ap85k83w1apkbbfdzzacfn9rvpfpdm";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.10.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
with lib;

buildLinux (args // rec {
version = "5.10.81";
version = "5.10.83";

# 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;
Expand All @@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1nssv94zivx08vrxxflq4dxk5fxl3azsqlnzvw58qnf469hniqd2";
sha256 = "0w4vq8wby3m9f5ryssh6z948m6zj1bjz9x432805dnrxyd1rl9gg";
};
} // (args.argsOverride or {}))
18 changes: 0 additions & 18 deletions pkgs/os-specific/linux/kernel/linux-5.14.nix

This file was deleted.

4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.15.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
with lib;

buildLinux (args // rec {
version = "5.15.4";
version = "5.15.6";

# 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;
Expand All @@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1jnbk7mb3s5xc0a23qd07n28dls9y94cdv2bdy71bxk5bsvhz7al";
sha256 = "1w0plw9rzk2c0g8yxzwj7c6wkq538sy56mx1skmf58wrl83bmsdk";
};
} // (args.argsOverride or { }))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.4.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
with lib;

buildLinux (args // rec {
version = "5.4.161";
version = "5.4.163";

# 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;
Expand All @@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "19rrz7fzka506bpgy229v1sbaxc2s609ldmxc2522y9h5aswcj9i";
sha256 = "1glh0azkrqdwydvbz9rp3czc5ppb72gq7svl3zbkjc6qfqbzwik2";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
, ... } @ args:

let
version = "5.10.78-rt55"; # updated by ./update-rt.sh
version = "5.10.78-rt56"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
Expand All @@ -25,7 +25,7 @@ in buildLinux (args // {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1wcw682r238qi5jgn5zk9m6j2506p9ypfax13bzhjfyjzz3h98kp";
sha256 = "0fg627hd0yq2cnbli2v795qfdwhgqqyzmxrq03vyqwg8471kdqzb";
};
}; in [ rt-patch ] ++ kernelPatches;

Expand Down
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@
, ... } @ args:

let
version = "5.4.154-rt65"; # updated by ./update-rt.sh
version = "5.4.161-rt66"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
inherit version;

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "01iwbz1ncakw90yykdw3cx04wnclwf1qa8nmlis08svbcvs99285";
sha256 = "19rrz7fzka506bpgy229v1sbaxc2s609ldmxc2522y9h5aswcj9i";
};

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

Expand Down
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/zfs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
, enablePython ? true

# for determining the latest compatible linuxPackages
, linuxPackages_5_14 ? pkgs.linuxKernel.packages.linux_5_14
, linuxPackages_5_10 ? pkgs.linuxKernel.packages.linux_5_10
}:

with lib;
Expand Down Expand Up @@ -216,7 +216,7 @@ in {
zfsStable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15";
latestCompatibleLinuxPackages = linuxPackages_5_14;
latestCompatibleLinuxPackages = linuxPackages_5_10;

# this package should point to the latest release.
version = "2.1.1";
Expand All @@ -227,7 +227,7 @@ in {
zfsUnstable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15";
latestCompatibleLinuxPackages = linuxPackages_5_14;
latestCompatibleLinuxPackages = linuxPackages_5_10;

# this package should point to a version / git revision compatible with the latest kernel release
# IMPORTANT: Always use a tagged release candidate or commits from the
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,6 @@ mapAliases ({
linuxPackages_4_19 = linuxKernel.packages.linux_4_19;
linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
linuxPackages_5_10 = linuxKernel.packages.linux_5_10;
linuxPackages_5_14 = linuxKernel.packages.linux_5_14;
linuxPackages_5_15 = linuxKernel.packages.linux_5_15;

linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95;
Expand All @@ -493,7 +492,6 @@ mapAliases ({
linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4;
linux_5_10 = linuxKernel.kernels.linux_5_10;
linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;
linux_5_14 = linuxKernel.kernels.linux_5_14;
linux_5_15 = linuxKernel.kernels.linux_5_15;

# added 2020-04-04
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22200,8 +22200,6 @@ with pkgs;
linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened;
linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened;
linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;
linuxPackages_5_14_hardened = linuxKernel.packages.linux_5_14_hardened;
linux_5_14_hardened = linuxKernel.kernels.linux_5_14_hardened;
linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened;
linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened;

Expand Down
10 changes: 0 additions & 10 deletions pkgs/top-level/linux-kernels.nix
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,6 @@ in {
];
};

linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};

linux_5_15 = callPackage ../os-specific/linux/kernel/linux-5.15.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
Expand Down Expand Up @@ -229,7 +222,6 @@ in {
linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { };
linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { };
linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
linux_5_14_hardened = hardenedKernelFor kernels.linux_5_14 { };
linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };

}));
Expand Down Expand Up @@ -472,7 +464,6 @@ in {
linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19);
linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4);
linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);
linux_5_14 = recurseIntoAttrs (packagesFor kernels.linux_5_14);
linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
};

Expand Down Expand Up @@ -502,7 +493,6 @@ in {
linux_4_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_19 { });
linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 { });
linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });
linux_5_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_14 { });
linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });

linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
Expand Down