From 9b42f787bb834b11452fcb45c236e7f87c090b58 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 21 Apr 2026 00:24:25 +0200 Subject: [PATCH 01/12] nixos/test-driver: fix driverInteractive test_script invocation See https://github.com/NixOS/nixpkgs/pull/510385/changes/BASE..f1bcb61731224bd8440510fc620d3c51f3e51c85 --- nixos/lib/test-driver/src/test_driver/driver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/src/test_driver/driver.py b/nixos/lib/test-driver/src/test_driver/driver.py index 8b6a5dfef5a0..91d38b7e1828 100644 --- a/nixos/lib/test-driver/src/test_driver/driver.py +++ b/nixos/lib/test-driver/src/test_driver/driver.py @@ -315,7 +315,7 @@ class Driver: general_symbols = dict( start_all=self.start_all, - test_script=self.config.test_script, + test_script=self.test_script, machines=self.machines, machines_qemu=self.machines_qemu, machines_nspawn=self.machines_nspawn, From b35551e8388c5cbf048704a4c7958ed4110a6047 Mon Sep 17 00:00:00 2001 From: Jacek Galowicz Date: Thu, 23 Apr 2026 09:43:12 +0000 Subject: [PATCH 02/12] nixos-test-driver: don't assert on vhost_vsock as tests without VMs would be just fine without it --- nixos/lib/test-driver/src/test_driver/driver.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/lib/test-driver/src/test_driver/driver.py b/nixos/lib/test-driver/src/test_driver/driver.py index 91d38b7e1828..9ee11ff41ea0 100644 --- a/nixos/lib/test-driver/src/test_driver/driver.py +++ b/nixos/lib/test-driver/src/test_driver/driver.py @@ -360,8 +360,6 @@ class Driver: if not self.config.enable_ssh_backdoor: return - assert self.vhost_vsock is not None - if self.machines: print("SSH backdoor enabled, the machines can be accessed like this:") print( From 18004da3e7e37f1d2fde796cbbcb6e25dd0ac914 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 24 Apr 2026 18:23:25 +0000 Subject: [PATCH 03/12] ruff: 0.15.11 -> 0.15.12 Diff: https://github.com/astral-sh/ruff/compare/0.15.11...0.15.12 Changelog: https://github.com/astral-sh/ruff/releases/tag/0.15.12 --- pkgs/by-name/ru/ruff/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 260a11e50f7f..678055dd8c80 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruff"; - version = "0.15.11"; + version = "0.15.12"; __structuredAttrs = true; @@ -24,12 +24,12 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "astral-sh"; repo = "ruff"; tag = finalAttrs.version; - hash = "sha256-hFKUbgYrwiSPTqNZD7HlDaoHueZrJxbrL1g/v1WD6GA="; + hash = "sha256-BbWOmr1/QsexDZzXPvkAstRBBcFmO0ZRrpkpXJpEXWk="; }; cargoBuildFlags = [ "--package=ruff" ]; - cargoHash = "sha256-gj0Ks9uyRE1Z8LELHmnpElHLCdP6lf/bE5ji+7qD9aA="; + cargoHash = "sha256-vv1D3bu0zLuLLxNiRESScs7fQKvx1CNfMKrseRzzxtw="; nativeBuildInputs = [ installShellFiles ]; From f3ea6393f6a983adf784269237bba6474d18178d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Apr 2026 01:53:40 +0000 Subject: [PATCH 04/12] libblake3: 1.8.4 -> 1.8.5 --- pkgs/by-name/li/libblake3/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix index d2d392071d73..08740597b3a3 100644 --- a/pkgs/by-name/li/libblake3/package.nix +++ b/pkgs/by-name/li/libblake3/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libblake3"; - version = "1.8.4"; + version = "1.8.5"; outputs = [ "out" @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "BLAKE3-team"; repo = "BLAKE3"; tag = finalAttrs.version; - hash = "sha256-Xz0LH0YpUjDishvXsW6VNK8msFlPXg08wFoSfbgws0g="; + hash = "sha256-4Oany3uk0759YIZgD1gsONSFU1Mn/GAMvsSeP33J9Ts="; }; sourceRoot = finalAttrs.src.name + "/c"; From 80109f6539fb83aac79d09b1fece9da482cc26de Mon Sep 17 00:00:00 2001 From: Yureka Date: Sun, 26 Apr 2026 13:10:12 +0200 Subject: [PATCH 05/12] nixos: Set mmap ASLR entropy to a safe default on AArch64 The eval-time access to kernel config is not enabled for any nixpkgs-packaged kernels by default since it requires IFD and so all kernels (including nixos-apple-silicon and rpi kernel) will end up with the max of 33, which will lead to the systemd-sysctl service failing. Additionally, there are factors other than the pagesize which can cause 33 to be an invalid argument. --- nixos/modules/config/sysctl.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index 6b6e8e879012..96bd0e961989 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -96,18 +96,10 @@ in # Maximise address space randomisation. "vm.mmap_rnd_bits" = lib.mkMerge [ (lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 ( - let - kernel = config.boot.kernelPackages.kernel; - isYes = kernel.config.isYes or (_: false); - in - lib.mkDefault ( - if isYes "ARM64_64K_PAGES" then - 29 - else if isYes "ARM64_16K_PAGES" then - 31 - else - 33 - ) + # Ideally, we'd want to set this to 33 on 4K pagesize + # kernels, but some vendor kernels e.g. linux_rpi can + # do a maximum of 24. + lib.mkDefault 24 )) (lib.mkIf pkgs.stdenv.hostPlatform.isx86_64 (lib.mkDefault 32)) ]; From be994ce8a873ccf624a26cc3377a51189ce9fc34 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 27 Apr 2026 17:54:45 +0300 Subject: [PATCH 06/12] linux/common-config: update for 7.1 Ham radio is gone, DMABUF_MOVE_NOTIFY is unconditional, NET_FOU is m on x86_64-linux but y on aarch64-linux, which throws off IPV6_FOU_TUNNEL now. --- pkgs/os-specific/linux/kernel/common-config.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index b2370b662913..4761cdda962c 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -185,6 +185,7 @@ let X86_INTEL_LPSS = yes; X86_INTEL_PSTATE = yes; X86_AMD_PSTATE = whenAtLeast "5.17" yes; + X86_AMD_PSTATE_DYNAMIC_EPP = whenAtLeast "7.1" yes; # Intel DPTF (Dynamic Platform and Thermal Framework) Support ACPI_DPTF = yes; @@ -318,13 +319,14 @@ let IPV6_MROUTE = yes; IPV6_MROUTE_MULTIPLE_TABLES = yes; IPV6_PIMSM_V2 = yes; - IPV6_FOU_TUNNEL = module; + 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; @@ -403,8 +405,8 @@ let MAC80211_DEBUGFS = yes; # HAM radio - HAMRADIO = yes; - AX25 = module; + HAMRADIO = whenOlder "7.1" yes; + AX25 = whenOlder "7.1" module; } // lib.optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") { # Not enabled by default, hides modules behind it @@ -565,6 +567,9 @@ let # Enable CEC over DisplayPort DRM_DP_CEC = whenOlder "6.10" yes; DRM_DISPLAY_DP_AUX_CEC = whenAtLeast "6.10" yes; + + # Enable RAS reporting via netlink + DRM_RAS = whenAtLeast "7.1" yes; } // lib.optionalAttrs @@ -705,6 +710,7 @@ let EXT4_FS_SECURITY = yes; NTFS_FS = whenBetween "5.15" "6.9" no; + NTFS_FS_POSIX_ACL = whenAtLeast "7.1" yes; NTFS3_LZX_XPRESS = whenAtLeast "5.15" yes; NTFS3_FS_POSIX_ACL = whenAtLeast "5.15" yes; @@ -1379,7 +1385,7 @@ let ) yes; # required for P2P DMABUF - DMABUF_MOVE_NOTIFY = lib.mkIf stdenv.hostPlatform.is64bit (whenAtLeast "6.6" yes); + DMABUF_MOVE_NOTIFY = lib.mkIf stdenv.hostPlatform.is64bit (whenBetween "6.6" "7.1" yes); # required for P2P transfers between accelerators HSA_AMD_P2P = lib.mkIf stdenv.hostPlatform.is64bit (whenAtLeast "6.6" yes); From 103e650eac4600aec7d98728741f85c79a33e461 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 27 Apr 2026 17:48:55 +0300 Subject: [PATCH 07/12] linux_testing: 7.0-rc7 -> 7.1-rc1 --- 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 9b6e64e0d713..40fcca2e4067 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "7.0-rc7", - "hash": "sha256:0d4199hy9z3md6ia1p2awy89y2fqpwvgadn0j850f4xckz2hqdgf", + "version": "7.1-rc1", + "hash": "sha256:030ip35npihl5az979w2cqymj5hl8h9na2930fa4ar4zkny83jzk", "lts": false }, "6.1": { From 94bcadf614daf52c0dba8dd1d7b92c6006ce9c7d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 27 Apr 2026 20:42:55 +0000 Subject: [PATCH 08/12] linux_7_0: 7.0.1 -> 7.0.2 --- 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 40fcca2e4067..ae95fb933bb0 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.1", - "hash": "sha256:1gw7v1j0pp2w6fm5y1n0krhnfvgab2jkrvcvwl8hx614dnikbjdj", + "version": "7.0.2", + "hash": "sha256:0qknrb9539vwh8314nklaj2s7y1djag5b7hbrf6a89s5541ilnak", "lts": false } } From e9133d3bd8b032933bb849542bf5b26a046f3bfd Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 27 Apr 2026 20:42:58 +0000 Subject: [PATCH 09/12] linux_6_18: 6.18.24 -> 6.18.25 --- 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 ae95fb933bb0..4a15e51850ed 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.24", - "hash": "sha256:0pr5s7hkmn7n17bm7p6sqrkq8g9z42jnvqihv96kn42qrrbwa1y2", + "version": "6.18.25", + "hash": "sha256:160qplwzx48rcvh53wz60c7xdnw11sdhfs6fysd2c2s3sh3hls19", "lts": true }, "7.0": { From 53f4176d38771c3207bb10263e7ebd4b0019f7a7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 27 Apr 2026 20:43:00 +0000 Subject: [PATCH 10/12] linux_6_12: 6.12.83 -> 6.12.84 --- 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 4a15e51850ed..ac5010d41a24 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.83", - "hash": "sha256:0cfzvhm876jm61cy023apwmi5axjilwfc0xnag9jd9fzs4n1gqrr", + "version": "6.12.84", + "hash": "sha256:1pajzxxp2jpjzjav4inbz58hm4xdacj10fp899wmalqzgcx4cvnm", "lts": true }, "6.18": { From 95059d77894658df3d4eb1607e274b8f24e87d9f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 27 Apr 2026 20:43:02 +0000 Subject: [PATCH 11/12] linux_6_6: 6.6.135 -> 6.6.136 --- 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 ac5010d41a24..2a0c297414e2 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "lts": true }, "6.6": { - "version": "6.6.135", - "hash": "sha256:0ahklx827y6rnh77a77bf4qr3sbp2z5z12l98avfv78nwznkilnk", + "version": "6.6.136", + "hash": "sha256:0wglpjmrwdghbdh3rs3qw5kyacrcdw77cqzwwmp7h798k0dd5ckg", "lts": true }, "6.12": { From b1b4d28db3aace8cb1deeb6880d6fe470995e96c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 28 Apr 2026 10:19:08 +1000 Subject: [PATCH 12/12] Revert "libblake3: 1.8.4 -> 1.8.5" This reverts commit f3ea6393f6a983adf784269237bba6474d18178d. --- pkgs/by-name/li/libblake3/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix index 08740597b3a3..d2d392071d73 100644 --- a/pkgs/by-name/li/libblake3/package.nix +++ b/pkgs/by-name/li/libblake3/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libblake3"; - version = "1.8.5"; + version = "1.8.4"; outputs = [ "out" @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "BLAKE3-team"; repo = "BLAKE3"; tag = finalAttrs.version; - hash = "sha256-4Oany3uk0759YIZgD1gsONSFU1Mn/GAMvsSeP33J9Ts="; + hash = "sha256-Xz0LH0YpUjDishvXsW6VNK8msFlPXg08wFoSfbgws0g="; }; sourceRoot = finalAttrs.src.name + "/c";