diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-30 12:01:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-30 12:01:05 +0000 |
| commit | 7f11b9b46bf4693acc2d94a04b2b59ea239c4cc2 (patch) | |
| tree | d07370cf304aa699dcdf2880ce5f77fab5e729a3 /pkgs/os-specific | |
| parent | b4a443d8199a2ab4793da80f5b71fd48f1c6436c (diff) | |
| parent | 3e93e2445ab48d167d27cf0d45f684cb0a389810 (diff) | |
| download | nixpkgs-7f11b9b46bf4693acc2d94a04b2b59ea239c4cc2.tar nixpkgs-7f11b9b46bf4693acc2d94a04b2b59ea239c4cc2.tar.gz nixpkgs-7f11b9b46bf4693acc2d94a04b2b59ea239c4cc2.tar.bz2 nixpkgs-7f11b9b46bf4693acc2d94a04b2b59ea239c4cc2.tar.lz nixpkgs-7f11b9b46bf4693acc2d94a04b2b59ea239c4cc2.tar.xz nixpkgs-7f11b9b46bf4693acc2d94a04b2b59ea239c4cc2.tar.zst nixpkgs-7f11b9b46bf4693acc2d94a04b2b59ea239c4cc2.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/kernels-org.json | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 8 |
3 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 3c1697e1c08..001f3740a44 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -558,6 +558,8 @@ let PERSISTENT_KEYRINGS = yes; # enable temporary caching of the last request_key() result KEYS_REQUEST_CACHE = whenAtLeast "5.3" yes; + # randomized slab caches + RANDOM_KMALLOC_CACHES = whenAtLeast "6.6" yes; } // optionalAttrs stdenv.hostPlatform.isx86_64 { # Enable Intel SGX X86_SGX = whenAtLeast "5.11" yes; @@ -572,6 +574,8 @@ let KVM_AMD_SEV = yes; # AMD SEV-SNP SEV_GUEST = whenAtLeast "5.19" module; + # Shadow stacks + X86_USER_SHADOW_STACK = whenAtLeast "6.6" yes; }; microcode = { diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 8137358552a..e8710454223 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -30,5 +30,9 @@ "4.14": { "version": "4.14.328", "hash": "sha256:1igcpvnhwwrczfdsafmszvi0456k7f6j4cgpfw6v6afw09p95d8x" + }, + "6.6": { + "version": "6.6", + "hash": "sha256:1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr" } } diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 45c4ad8f192..a55588b2cea 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,14 +6,14 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.1.58"; - hash = "sha256-Lnp1CSh1jLbIkEx9hLfxhdIA12iQZmywhOec9uZ7UjI="; + version = "6.1.60"; + hash = "sha256-KYCeONJxyFPee4pvBLRw/MBTzPU7D2oZCrAVr3t/yPM="; variant = "lts"; }; mainVariant = { - version = "6.5.8"; - hash = "sha256-lHi+O7RE6YdiqPmuxHajGkc7jS9F5cB89+JbTVKkB/c="; + version = "6.5.9"; + hash = "sha256-5SFPBsDTmq7tA6pyM7rbIjBPAtPbqhUl6VfA2z5baPA="; variant = "main"; }; |