Merge master into staging-next (a3eee1a8) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -5622,6 +5622,12 @@
		githubId = 2147649;
		name = "Euan Kemp";
		};
		eureka-cpu = {
		email = "github.eureka@gmail.com";
		github = "eureka-cpu";
		githubId = 57543709;
		name = "Chris O'Brien";
		};
		evalexpr = {
		name = "Jonathan Wilkins";
		email = "nixos@wilkins.tech";

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,12 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
		- `services.avahi.nssmdns` got split into `services.avahi.nssmdns4` and `services.avahi.nssmdns6` which enable the mDNS NSS switch for IPv4 and IPv6 respectively.
		Since most mDNS responders only register IPv4 addresses, most users want to keep the IPv6 support disabled to avoid long timeouts.

		- `networking.iproute2.enable` now does not set `environment.etc."iproute2/rt_tables".text`.

		Setting `environment.etc."iproute2/{CONFIG_FILE_NAME}".text` will override the whole configuration file instead of appending it to the upstream configuration file.

		`CONFIG_FILE_NAME` includes `bpf_pinning`, `ematch_map`, `group`, `nl_protos`, `rt_dsfield`, `rt_protos`, `rt_realms`, `rt_scopes`, and `rt_tables`.

		## Other Notable Changes {#sec-release-24.05-notable-changes}

		<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
		@@ -57,6 +63,10 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
		existing process, but will need to start that process from gdb (so it is a
		child). Or you can set `boot.kernel.sysctl."kernel.yama.ptrace_scope"` to 0.

		- [Nginx virtual hosts](#opt-services.nginx.virtualHosts) using `forceSSL` or
		`globalRedirect` can now have redirect codes other than 301 through
		`redirectCode`.

		- Gitea 1.21 upgrade has several breaking changes, including:
		- Custom themes and other assets that were previously stored in `custom/public/` now belong in `custom/public/assets/`
		- New instances of Gitea using MySQL now ignore the `[database].CHARSET` config option and always use the `utf8mb4` charset, existing instances should migrate via the `gitea doctor convert` CLI command.

nixos/modules/config/iproute2.nix

+2 −3

Original line number	Diff line number	Diff line
		@@ -18,10 +18,9 @@ in
		};

		config = mkIf cfg.enable {
		environment.etc."iproute2/rt_tables" = {
		environment.etc."iproute2/rt_tables.d/nixos.conf" = {
		mode = "0644";
		text = (fileContents "${pkgs.iproute2}/lib/iproute2/rt_tables")
		+ (optionalString (cfg.rttablesExtraConfig != "") "\n\n${cfg.rttablesExtraConfig}");
		text = cfg.rttablesExtraConfig;
		};
		};
		}

nixos/modules/services/desktops/flatpak.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ in {
		services.dbus.packages = [ pkgs.flatpak ];

		systemd.packages = [ pkgs.flatpak ];
		systemd.tmpfiles.packages = [ pkgs.flatpak ];

		environment.profiles = [
		"$HOME/.local/share/flatpak/exports"

nixos/modules/services/web-servers/nginx/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -377,7 +377,7 @@ let
		server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases};
		${acmeLocation}
		location / {
		return 301 https://$host$request_uri;
		return ${toString vhost.redirectCode} https://$host$request_uri;
		}
		}
		''}
		@@ -396,7 +396,7 @@ let
		${optionalString (vhost.root != null) "root ${vhost.root};"}
		${optionalString (vhost.globalRedirect != null) ''
		location / {
		return 301 http${optionalString hasSSL "s"}://${vhost.globalRedirect}$request_uri;
		return ${toString vhost.redirectCode} http${optionalString hasSSL "s"}://${vhost.globalRedirect}$request_uri;
		}
		''}
		${optionalString hasSSL ''