mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-11 07:15:54 +03:00
Merge pull request #301617 from K900/kernels-20240404
Kernel updates for 2024-04-04
This commit is contained in:
commit
6f139367a3
@ -31,7 +31,6 @@ let
|
||||
linux_5_15_hardened
|
||||
linux_6_1_hardened
|
||||
linux_6_6_hardened
|
||||
linux_6_7_hardened
|
||||
linux_rt_5_4
|
||||
linux_rt_5_10
|
||||
linux_rt_5_15
|
||||
|
@ -24,15 +24,11 @@
|
||||
"hash": "sha256:10dww3cyazcf3wjzh8igpa0frb8gvl6amnksh42zfkji4mskh2r6"
|
||||
},
|
||||
"6.6": {
|
||||
"version": "6.6.24",
|
||||
"hash": "sha256:1xgni9daid8c01f29xnxvrzja4sw0b1d5hhdxcw96cg8v9wzi7iy"
|
||||
},
|
||||
"6.7": {
|
||||
"version": "6.7.12",
|
||||
"hash": "sha256:113rf3jqfpf3wcv637zbq5ww2hpaaf23y6dsmkds01l8jkipjabc"
|
||||
"version": "6.6.25",
|
||||
"hash": "sha256:0i0zvqlj02rm6wpbidji0rn9559vrpfc1b8gbfjk70lhhyz11llr"
|
||||
},
|
||||
"6.8": {
|
||||
"version": "6.8.3",
|
||||
"hash": "sha256:11n9jsjg1wgffchpl6frk26pk4jx2m9m0w8cmizrmvhla1nvaznv"
|
||||
"version": "6.8.4",
|
||||
"hash": "sha256:0qwywy89an1w0yvs5957kqyv74mwgxady521w2lmyq00zjaw9pnm"
|
||||
}
|
||||
}
|
||||
|
@ -1,8 +1,8 @@
|
||||
{ stdenv, lib, fetchsvn, linux
|
||||
, scripts ? fetchsvn {
|
||||
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
|
||||
rev = "19523";
|
||||
sha256 = "0j3fhmb931niskv67v6ngwc11v2z78rr3bcy4369j44aqnbfaq1y";
|
||||
rev = "19527";
|
||||
sha256 = "0sb1qxc25g7f3v6qym9iwi3xjwmxzrf7w33yfmvv3k09rlfndijy";
|
||||
}
|
||||
, ...
|
||||
}:
|
||||
|
@ -66,15 +66,6 @@
|
||||
patch = ./export-rt-sched-migrate.patch;
|
||||
};
|
||||
|
||||
rust_1_74 = {
|
||||
name = "rust-1.74.patch";
|
||||
patch = fetchpatch {
|
||||
name = "rust-1.74.patch";
|
||||
url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=80fe9e51510b23472ad0f97175556490549ed714";
|
||||
hash = "sha256-yGt7PwqN/G+ZtZSt6eARvVFdkC8tnUiu0Fz4cFCyguM=";
|
||||
};
|
||||
};
|
||||
|
||||
rust_1_75 = {
|
||||
name = "rust-1.75.patch";
|
||||
patch = ./rust-1.75.patch;
|
||||
|
@ -17,7 +17,7 @@ callPackage ./generic.nix args {
|
||||
# check the release notes for compatible kernels
|
||||
kernelCompatible = kernel.kernelOlder "6.8";
|
||||
|
||||
latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_7;
|
||||
latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_6;
|
||||
|
||||
# This is a fixed version to the 2.1.x series, move only
|
||||
# if the 2.1.x series moves.
|
||||
|
@ -16,7 +16,7 @@ callPackage ./generic.nix args {
|
||||
# check the release notes for compatible kernels
|
||||
kernelCompatible = kernel.kernelOlder "6.8";
|
||||
|
||||
latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_7;
|
||||
latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_6;
|
||||
|
||||
# this package should point to the latest release.
|
||||
version = "2.2.3";
|
||||
|
@ -16,7 +16,7 @@ callPackage ./generic.nix args {
|
||||
# check the release notes for compatible kernels
|
||||
kernelCompatible = kernel.kernelOlder "6.9";
|
||||
|
||||
latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_7;
|
||||
latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_6;
|
||||
|
||||
# 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
|
||||
|
@ -27620,8 +27620,6 @@ with pkgs;
|
||||
linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened;
|
||||
linuxPackages_6_6_hardened = linuxKernel.packages.linux_6_6_hardened;
|
||||
linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened;
|
||||
linuxPackages_6_7_hardened = linuxKernel.packages.linux_6_7_hardened;
|
||||
linux_6_7_hardened = linuxKernel.kernels.linux_6_7_hardened;
|
||||
|
||||
# GNU Linux-libre kernels
|
||||
linuxPackages-libre = linuxKernel.packages.linux_libre;
|
||||
|
@ -185,17 +185,6 @@ in {
|
||||
];
|
||||
};
|
||||
|
||||
linux_6_7 = callPackage ../os-specific/linux/kernel/mainline.nix {
|
||||
branch = "6.7";
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.rust_1_74
|
||||
kernelPatches.rust_1_75
|
||||
kernelPatches.rust_1_76
|
||||
];
|
||||
};
|
||||
|
||||
linux_6_8 = callPackage ../os-specific/linux/kernel/mainline.nix {
|
||||
branch = "6.8";
|
||||
kernelPatches = [
|
||||
@ -269,7 +258,6 @@ in {
|
||||
linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
|
||||
linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };
|
||||
linux_6_6_hardened = hardenedKernelFor kernels.linux_6_6 { };
|
||||
linux_6_7_hardened = hardenedKernelFor kernels.linux_6_7 { };
|
||||
|
||||
} // lib.optionalAttrs config.allowAliases {
|
||||
linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11";
|
||||
@ -281,12 +269,14 @@ in {
|
||||
linux_6_3 = throw "linux 6.3 was removed because it has reached its end of life upstream";
|
||||
linux_6_4 = throw "linux 6.4 was removed because it has reached its end of life upstream";
|
||||
linux_6_5 = throw "linux 6.5 was removed because it has reached its end of life upstream";
|
||||
linux_6_7 = throw "linux 6.7 was removed because it has reached its end of life upstream";
|
||||
|
||||
linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option";
|
||||
|
||||
linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
|
||||
linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";
|
||||
linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream";
|
||||
linux_6_7_hardened = throw "linux 6.7 was removed because it has reached its end of life upstream";
|
||||
}));
|
||||
/* Linux kernel modules are inherently tied to a specific kernel. So
|
||||
rather than provide specific instances of those packages for a
|
||||
@ -600,7 +590,6 @@ in {
|
||||
linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
|
||||
linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);
|
||||
linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
|
||||
linux_6_7 = recurseIntoAttrs (packagesFor kernels.linux_6_7);
|
||||
linux_6_8 = recurseIntoAttrs (packagesFor kernels.linux_6_8);
|
||||
__attrsFailEvaluation = true;
|
||||
} // lib.optionalAttrs config.allowAliases {
|
||||
@ -613,6 +602,7 @@ in {
|
||||
linux_6_3 = throw "linux 6.3 was removed because it reached its end of life upstream"; # Added 2023-07-22
|
||||
linux_6_4 = throw "linux 6.4 was removed because it reached its end of life upstream"; # Added 2023-10-02
|
||||
linux_6_5 = throw "linux 6.5 was removed because it reached its end of life upstream"; # Added 2024-02-28
|
||||
linux_6_7 = throw "linux 6.7 was removed because it reached its end of life upstream"; # Added 2024-04-04
|
||||
};
|
||||
|
||||
rtPackages = {
|
||||
@ -646,7 +636,6 @@ in {
|
||||
linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened);
|
||||
linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened);
|
||||
linux_6_6_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_6_hardened);
|
||||
linux_6_7_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_7_hardened);
|
||||
|
||||
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
|
||||
linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);
|
||||
@ -662,6 +651,7 @@ in {
|
||||
linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
|
||||
linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";
|
||||
linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream";
|
||||
linux_6_7_hardened = throw "linux 6.7 was removed because it has reached its end of life upstream";
|
||||
linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option";
|
||||
});
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user