Merge staging-next into staging (1a9cdd1a) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+12 −0

Original line number	Diff line number	Diff line
		@@ -9834,6 +9834,12 @@
		githubId = 4753752;
		name = "guttermonk";
		};
		guylamar2006 = {
		name = "guylamar2006";
		github = "guylamar2006";
		githubId = 4555064;
		keys = [ { fingerprint = "0438 6FD4 D588 E32B 206F 2B49 1C4F DEA2 DB34 FEE4"; } ];
		};
		guyonvarch = {
		github = "guyonvarch";
		githubId = 6768842;
		@@ -9891,6 +9897,12 @@
		githubId = 5190539;
		keys = [ { fingerprint = "AD3D 53CB A68A FEC0 8065 BCBB 416A D9E8 E372 C075"; } ];
		};
		hadziqM = {
		name = "Hadziq Masfuh";
		email = "dimascrazz@gmail.com";
		github = "HadziqM";
		githubId = 50319538;
		};
		hagl = {
		email = "harald@glie.be";
		github = "hagl";

nixos/doc/manual/release-notes/rl-2511.section.md

+27 −0

Original line number	Diff line number	Diff line
		@@ -160,6 +160,22 @@

		- `virtualisation.lxd` has been removed due to lack of Nixpkgs maintenance. Users can migrate to `virtualisation.incus`, a fork of LXD, as a replacement. See [Incus migration documentation](https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/) for migration information.

		- `virtualisation.libvirtd` now uses OVMF images shipped with QEMU for UEFI machines. `virtualisation.libvirtd.qemu.ovmf` has been removed.
		- OVMF images from underlying QEMU package are now made available under '/run/libvirt/nix-ovmf', fixing prior issues when using QEMU's automatic EFI firmware and feature handling, relied upon by GNOME Boxes, virsh, virt-manager, etc.
		- Domains that rely on automatic firmware and feature handling, i.e. `<os firmware='efi'>` need to trigger an update to `<loader>` and `<nvram>` entries.
		Using `virsh edit <domain>` and deleting aforementioned tags will cause libvirt to replace them with the new paths.
		- Configurations that relied on `virtualisation.libvirtd.qemu.ovmf` and had domains that did not use automatic firmware and feature handling, require a manual change to their domain configuration, updating `<loader>` and `<nvram>` entries from old path to the new path.
		\| Old Path \| New Path \|
		\|----------------------------------------\|--------------------------------------------------\|
		\| /run/libvirt/nix-ovmf/OVMF_CODE.fd \| /run/libvirt/nix-ovmf/edk2-x86_64-code.fd \|
		\| /run/libvirt/nix-ovmf/OVMF_VARS.fd \| /run/libvirt/nix-ovmf/edk2-i386-vars.fd \|
		\| /run/libvirt/nix-ovmf/OVMF_CODE.ms.fd \| /run/libvirt/nix-ovmf/edk2-x86_64-secure-code.fd \|
		\| /run/libvirt/nix-ovmf/OVMF_VARS.ms.fd \| /run/libvirt/nix-ovmf/edk2-i386-vars.fd \|
		\| /run/libvirt/nix-ovmf/AAVMF_CODE.fd \| /run/libvirt/nix-ovmf/edk2-aarch64-code.fd \|
		\| /run/libvirt/nix-ovmf/AAVMF_VARS.fd \| /run/libvirt/nix-ovmf/edk2-arm-vars.fd \|
		\| /run/libvirt/nix-ovmf/AAVMF_CODE.ms.fd \| /run/libvirt/nix-ovmf/edk2-aarch64-code.fd \|
		\| /run/libvirt/nix-ovmf/AAVMF_VARS.ms.fd \| /run/libvirt/nix-ovmf/edk2-arm-vars.fd \|

		- The non-LTS Forgejo package (`forgejo`) has been updated to 12.0.0. This release contains breaking changes, see the [release blog post](https://forgejo.org/2025-07-release-v12-0/)
		for all the details and how to ensure smooth upgrades.

		@@ -281,6 +297,15 @@
		- `services.nextcloud.configureRedis` now defaults to `true` in accordance with upstream recommendations to have caching for file locking. See the [upstream doc](https://docs.nextcloud.com/server/31/admin_manual/configuration_files/files_locking_transactional.html) for further details.

		- mate-wayland-session 1.28.4 is now using the default wayfire decorator instead of firedecor, thus `services.xserver.desktopManager.mate.enableWaylandSession` is no longer shipping firedecor. If you are experiencing broken window decorations after upgrade, backup and remove `~/.config/mate/wayfire.ini` and re-login.
		-
		- A new option [](#opt-boot.isNspawnContainer) has been added. This option will be used to guard nspawn-specific configuration in NixOS since [](#opt-boot.isContainer) is also used for different container-runtimes such as LXC.
		- The new option is automatically set to `true` by the declarative container module and `nixos-container` when not using flakes.
		- Existing setups can be migrated by running either
		- `nixos-container update <container-name> --config-file /path/to/the/config-file-in-use.nix`
		- `nixos-container update <container-name> --config '/* config code */'`
		- Setting the option by hand in your configuration when using flakes.
		- In all other cases, you'll need to set this option to `true` yourself.
		- `boot.isNspawnContainer` being `true` implies [](#opt-boot.isContainer) being `true`.

		- Due to [deprecation of gnome-session X11 support](https://blogs.gnome.org/alatiera/2025/06/08/the-x11-session-removal/), `services.desktopManager.pantheon` now defaults to pantheon-wayland session. The X11 session has been removed, see [this issue](https://github.com/elementary/session-settings/issues/91) for details.

		@@ -333,6 +358,8 @@

		- `services.netbird.server` now uses dedicated packages split out due to relicensing of server components to AGPLv3 with version `0.53.0`,

		- `linux_libre` & `linux_latest_libre` have been removed due to a lack of maintenance.

		- `services.pds` has been renamed to `services.bluesky-pds`.

		- `services.xserver.desktopManager.deepin` and associated packages have been removed due to being unmaintained. See issue [#422090](https://github.com/NixOS/nixpkgs/issues/422090) for more details.

nixos/modules/installer/tools/nixos-generate-config.pl

+1 −1

Original line number	Diff line number	Diff line
		@@ -306,7 +306,7 @@ if ($virt eq "microsoft") {

		# Pull in NixOS configuration for containers.
		if ($virt eq "systemd-nspawn") {
		push @attrs, "boot.isContainer = true;";
		push @attrs, "boot.isNspawnContainer = true;";
		}

nixos/modules/profiles/nix-builder-vm.nix

+4 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,10 @@ in
		default = false;
		internal = true;
		};
		options.boot.isNspawnContainer = lib.mkOption {
		default = false;
		internal = true;
		};
		}
		];

nixos/modules/services/networking/ncps.nix

+15 −1

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ let
		++ (lib.optional (cfg.cache.secretKeyPath != null) "--cache-secret-key-path='%d/secretKey'")
		++ (lib.forEach cfg.upstream.caches (url: "--upstream-cache='${url}'"))
		++ (lib.forEach cfg.upstream.publicKeys (pk: "--upstream-public-key='${pk}'"))
		++ (lib.optional (cfg.netrcFile != null) "--netrc-file='${cfg.netrcFile}'")
		);

		isSqlite = lib.strings.hasPrefix "sqlite:" cfg.cache.databaseURL;
		@@ -211,6 +212,16 @@ in
		'';
		};
		};

		netrcFile = lib.mkOption {
		type = lib.types.nullOr lib.types.str;
		default = null;
		example = "/etc/nix/netrc";
		description = ''
		The path to netrc file for upstream authentication.
		When unspecified ncps will look for ``$HOME/.netrc`.
		'';
		};
		};
		};

		@@ -341,5 +352,8 @@ in
		};
		};

		meta.maintainers = with lib.maintainers; [ kalbasit ];
		meta.maintainers = with lib.maintainers; [
		kalbasit
		aciceri
		];
		}