From 831b5bd6ca06488d6a3f4cc3cd26de337e687b58 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 1 May 2026 12:03:08 -0400 Subject: [PATCH 1/5] nixos: unset vm.mmap_rnd_compat_bits on 32-bit architectures vm.mmap_rnd_compat_bits is used for 32-bit compatibility on 64-bit architectures, therefore it is not present on 32-bit architectures. --- nixos/modules/config/sysctl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index 4a2ecd11e103..df4165fbbec5 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -81,8 +81,8 @@ in fi echo "vm.mmap_rnd_bits=$mmap_rnd_bits_max" >> $out '' - # HAVE_ARCH_MMAP_RND_COMPAT_BITS is not defined for LoongArch64 - + lib.optionalString (!pkgs.stdenv.hostPlatform.isLoongArch64) '' + # HAVE_ARCH_MMAP_RND_COMPAT_BITS is not defined on 32-bit architectures or LoongArch64 + + lib.optionalString (with pkgs.stdenv.hostPlatform; (!is32bit && !isLoongArch64)) '' mmap_rnd_compat_bits_max=$(grep "^CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=" $configfile | grep --only-matching "[0-9]*$") if [[ -z "$mmap_rnd_compat_bits_max" ]]; then echo "Unable to determine mmap_rnd_compat_bits_max. Check your kernel configfile is valid." From 933822f2a2fe0808ec5642095eee269afa0512e2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 4 May 2026 16:59:31 +0200 Subject: [PATCH 2/5] linux/common-config: leave FOU options to defaults Since IPV6_FOU_TUNNEL was set, I get an unexpected ip6tnl device at boot. It was set to y to accomodate Linux 7.1 divergences between aacrh64 and x86_64, but by just not setting NET_FOU or IPV6_FOU_TUNNEL, I get everything built as modules on both platforms, like we presumably want. Fixes: be994ce8a873 ("linux/common-config: update for 7.1") --- pkgs/os-specific/linux/kernel/common-config.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index b35c04259335..3c7edb9768eb 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -319,14 +319,12 @@ let IPV6_MROUTE = yes; IPV6_MROUTE_MULTIPLE_TABLES = yes; IPV6_PIMSM_V2 = yes; - IPV6_FOU_TUNNEL = yes; IPV6_SEG6_LWTUNNEL = yes; IPV6_SEG6_HMAC = yes; IPV6_SEG6_BPF = yes; NET_CLS_ACT = yes; NET_CLS_BPF = module; NET_ACT_BPF = module; - NET_FOU = yes; NET_SCHED = yes; NET_SCH_BPF = whenAtLeast "6.16" (whenPlatformHasEBPFJit yes); L2TP_V3 = yes; From dcfd61acf5870ad280ab54ae6e738603dfc5fbcf Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 7 May 2026 05:16:16 +0000 Subject: [PATCH 3/5] linux_7_0: 7.0.3 -> 7.0.4 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 37d28a722904..e861e374dcbd 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -35,8 +35,8 @@ "lts": true }, "7.0": { - "version": "7.0.3", - "hash": "sha256:074zjl0v901a9hafgpcxyyd395qs7y4kr4fcpgg3ssc8ayzsvv8b", + "version": "7.0.4", + "hash": "sha256:19spjbd4yc057xl9q79sv5fsvp75k4j082d7lqhxnnlj9kc8286r", "lts": false } } From bb4c937947b116a51a70e5e2b4f33a3d3492bdbc Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 7 May 2026 05:16:19 +0000 Subject: [PATCH 4/5] linux_6_18: 6.18.26 -> 6.18.27 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index e861e374dcbd..de1681a25327 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -30,8 +30,8 @@ "lts": true }, "6.18": { - "version": "6.18.26", - "hash": "sha256:1v5h0w3s8p5m22jxg992x1jfpwyi80ia70cdgiv47q3n6xfjyxsk", + "version": "6.18.27", + "hash": "sha256:1sp2bj3r3n9cn50wsp5nlmkr37d282bba40ryz5s42vgjj9pn095", "lts": true }, "7.0": { From 7f894b7c96a4b28125063d7df2acb8de00dbb82d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 7 May 2026 05:16:21 +0000 Subject: [PATCH 5/5] linux_6_12: 6.12.85 -> 6.12.86 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index de1681a25327..6ec859edb2ee 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -25,8 +25,8 @@ "lts": true }, "6.12": { - "version": "6.12.85", - "hash": "sha256:1v8a0z6znmr2m26l4744wndaimsh24zz6q4d7m4p8s0ayjcwjnp3", + "version": "6.12.86", + "hash": "sha256:0pdvdpr3nnvh4479j4z5k6i1qkrlzbzigmzqvffg7jy74yrj5vzd", "lts": true }, "6.18": {