staging-nixos merge for 2026-04-27 (#514238) (75748ff7) · Commits · nix / nixpkgs

nixos/lib/test-driver/src/test_driver/driver.py

+1 −3

Original line number	Diff line number	Diff line
		@@ -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,
		@@ -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(

nixos/modules/config/sysctl.nix

+4 −12

Original line number	Diff line number	Diff line
		@@ -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))
		];

pkgs/by-name/ru/ruff/package.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -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 ];

pkgs/os-specific/linux/kernel/common-config.nix

+10 −4

Original line number	Diff line number	Diff line
		@@ -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);

pkgs/os-specific/linux/kernel/kernels-org.json

+10 −10

Original line number	Diff line number	Diff line
		{
		"testing": {
		"version": "7.0-rc7",
		"hash": "sha256:0d4199hy9z3md6ia1p2awy89y2fqpwvgadn0j850f4xckz2hqdgf",
		"version": "7.1-rc1",
		"hash": "sha256:030ip35npihl5az979w2cqymj5hl8h9na2930fa4ar4zkny83jzk",
		"lts": false
		},
		"6.1": {
		@@ -20,23 +20,23 @@
		"lts": true
		},
		"6.6": {
		"version": "6.6.135",
		"hash": "sha256:0ahklx827y6rnh77a77bf4qr3sbp2z5z12l98avfv78nwznkilnk",
		"version": "6.6.136",
		"hash": "sha256:0wglpjmrwdghbdh3rs3qw5kyacrcdw77cqzwwmp7h798k0dd5ckg",
		"lts": true
		},
		"6.12": {
		"version": "6.12.83",
		"hash": "sha256:0cfzvhm876jm61cy023apwmi5axjilwfc0xnag9jd9fzs4n1gqrr",
		"version": "6.12.84",
		"hash": "sha256:1pajzxxp2jpjzjav4inbz58hm4xdacj10fp899wmalqzgcx4cvnm",
		"lts": true
		},
		"6.18": {
		"version": "6.18.24",
		"hash": "sha256:0pr5s7hkmn7n17bm7p6sqrkq8g9z42jnvqihv96kn42qrrbwa1y2",
		"version": "6.18.25",
		"hash": "sha256:160qplwzx48rcvh53wz60c7xdnw11sdhfs6fysd2c2s3sh3hls19",
		"lts": true
		},
		"7.0": {
		"version": "7.0.1",
		"hash": "sha256:1gw7v1j0pp2w6fm5y1n0krhnfvgab2jkrvcvwl8hx614dnikbjdj",
		"version": "7.0.2",
		"hash": "sha256:0qknrb9539vwh8314nklaj2s7y1djag5b7hbrf6a89s5541ilnak",
		"lts": false
		}
		}