commit
fb517fc0b0
|
@ -30,7 +30,6 @@ let
|
||||||
linux_5_4_hardened
|
linux_5_4_hardened
|
||||||
linux_5_10_hardened
|
linux_5_10_hardened
|
||||||
linux_5_15_hardened
|
linux_5_15_hardened
|
||||||
linux_5_18_hardened
|
|
||||||
|
|
||||||
linux_testing;
|
linux_testing;
|
||||||
};
|
};
|
||||||
|
|
|
@ -39,16 +39,6 @@
|
||||||
"sha256": "0h7r2k59jsw8ykb2p7nxrpazbwx1n5p3nmfbbj1lhib91fldjiys",
|
"sha256": "0h7r2k59jsw8ykb2p7nxrpazbwx1n5p3nmfbbj1lhib91fldjiys",
|
||||||
"version": "5.15.67"
|
"version": "5.15.67"
|
||||||
},
|
},
|
||||||
"5.18": {
|
|
||||||
"patch": {
|
|
||||||
"extra": "-hardened1",
|
|
||||||
"name": "linux-hardened-5.18.19-hardened1.patch",
|
|
||||||
"sha256": "1q61641b8lr87h04kjpd7izgi4kxdvknsn8ssmcs8n6fk6cswv8c",
|
|
||||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.19-hardened1/linux-hardened-5.18.19-hardened1.patch"
|
|
||||||
},
|
|
||||||
"sha256": "1mc8zhiw0v7fka64mydpdrxkrvy0jyqggq5lghw3pyqj2wjrpw6z",
|
|
||||||
"version": "5.18.19"
|
|
||||||
},
|
|
||||||
"5.19": {
|
"5.19": {
|
||||||
"patch": {
|
"patch": {
|
||||||
"extra": "-hardened1",
|
"extra": "-hardened1",
|
||||||
|
|
|
@ -1,18 +0,0 @@
|
||||||
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
buildLinux (args // rec {
|
|
||||||
version = "5.18.19";
|
|
||||||
|
|
||||||
# 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;
|
|
||||||
|
|
||||||
# branchVersion needs to be x.y
|
|
||||||
extraMeta.branch = versions.majorMinor version;
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
|
||||||
sha256 = "1mc8zhiw0v7fka64mydpdrxkrvy0jyqggq5lghw3pyqj2wjrpw6z";
|
|
||||||
};
|
|
||||||
} // (args.argsOverride or { }))
|
|
|
@ -16,7 +16,7 @@
|
||||||
, enablePython ? true
|
, enablePython ? true
|
||||||
|
|
||||||
# for determining the latest compatible linuxPackages
|
# for determining the latest compatible linuxPackages
|
||||||
, linuxPackages_5_18 ? pkgs.linuxKernel.packages.linux_5_18
|
, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -217,7 +217,7 @@ in {
|
||||||
zfsStable = common {
|
zfsStable = common {
|
||||||
# check the release notes for compatible kernels
|
# check the release notes for compatible kernels
|
||||||
kernelCompatible = kernel.kernelOlder "5.19";
|
kernelCompatible = kernel.kernelOlder "5.19";
|
||||||
latestCompatibleLinuxPackages = linuxPackages_5_18;
|
latestCompatibleLinuxPackages = linuxPackages_5_15;
|
||||||
|
|
||||||
# this package should point to the latest release.
|
# this package should point to the latest release.
|
||||||
version = "2.1.5";
|
version = "2.1.5";
|
||||||
|
@ -228,7 +228,7 @@ in {
|
||||||
zfsUnstable = common {
|
zfsUnstable = common {
|
||||||
# check the release notes for compatible kernels
|
# check the release notes for compatible kernels
|
||||||
kernelCompatible = kernel.kernelOlder "5.19";
|
kernelCompatible = kernel.kernelOlder "5.19";
|
||||||
latestCompatibleLinuxPackages = linuxPackages_5_18;
|
latestCompatibleLinuxPackages = linuxPackages_5_15;
|
||||||
|
|
||||||
# this package should point to a version / git revision compatible with the latest kernel release
|
# 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
|
# IMPORTANT: Always use a tagged release candidate or commits from the
|
||||||
|
|
|
@ -24555,8 +24555,6 @@ with pkgs;
|
||||||
linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;
|
linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;
|
||||||
linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened;
|
linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened;
|
||||||
linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened;
|
linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened;
|
||||||
linuxPackages_5_18_hardened = linuxKernel.packages.linux_5_18_hardened;
|
|
||||||
linux_5_18_hardened = linuxKernel.kernels.linux_5_18_hardened;
|
|
||||||
|
|
||||||
# Hardkernel (Odroid) kernels.
|
# Hardkernel (Odroid) kernels.
|
||||||
linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest;
|
linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest;
|
||||||
|
|
|
@ -168,12 +168,7 @@ in {
|
||||||
|
|
||||||
linux_5_17 = throw "linux 5.17 was removed because it has reached its end of life upstream";
|
linux_5_17 = throw "linux 5.17 was removed because it has reached its end of life upstream";
|
||||||
|
|
||||||
linux_5_18 = callPackage ../os-specific/linux/kernel/linux-5.18.nix {
|
linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream";
|
||||||
kernelPatches = [
|
|
||||||
kernelPatches.bridge_stp_helper
|
|
||||||
kernelPatches.request_key_helper
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
linux_5_19 = callPackage ../os-specific/linux/kernel/linux-5.19.nix {
|
linux_5_19 = callPackage ../os-specific/linux/kernel/linux-5.19.nix {
|
||||||
kernelPatches = [
|
kernelPatches = [
|
||||||
|
@ -195,7 +190,7 @@ in {
|
||||||
else testing;
|
else testing;
|
||||||
|
|
||||||
linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec {
|
linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec {
|
||||||
kernel = linux_5_18;
|
kernel = linux_5_19;
|
||||||
kernelPatches = kernel.kernelPatches;
|
kernelPatches = kernel.kernelPatches;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -248,7 +243,7 @@ in {
|
||||||
linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { };
|
linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { };
|
||||||
linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
|
linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
|
||||||
linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
|
linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
|
||||||
linux_5_18_hardened = hardenedKernelFor kernels.linux_5_18 { };
|
linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
|
||||||
|
|
||||||
}));
|
}));
|
||||||
/* Linux kernel modules are inherently tied to a specific kernel. So
|
/* Linux kernel modules are inherently tied to a specific kernel. So
|
||||||
|
@ -533,7 +528,7 @@ in {
|
||||||
linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
|
linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
|
||||||
linux_5_16 = throw "linux 5.16 was removed because it reached its end of life upstream"; # Added 2022-04-23
|
linux_5_16 = throw "linux 5.16 was removed because it reached its end of life upstream"; # Added 2022-04-23
|
||||||
linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23
|
linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23
|
||||||
linux_5_18 = recurseIntoAttrs (packagesFor kernels.linux_5_18);
|
linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17
|
||||||
linux_5_19 = recurseIntoAttrs (packagesFor kernels.linux_5_19);
|
linux_5_19 = recurseIntoAttrs (packagesFor kernels.linux_5_19);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -573,7 +568,7 @@ in {
|
||||||
});
|
});
|
||||||
linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });
|
linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });
|
||||||
linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });
|
linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });
|
||||||
linux_5_18_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_18 { });
|
linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
|
||||||
|
|
||||||
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
|
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
|
||||||
linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);
|
linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);
|
||||||
|
|
Loading…
Reference in a new issue