Merge branch 'master' into haskell-updates (5b91d156) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+12 −0

Original line number	Diff line number	Diff line
		@@ -6667,6 +6667,12 @@
		githubId = 54999;
		name = "Ariel Nunez";
		};
		ionutnechita = {
		email = "ionut_n2001@yahoo.com";
		github = "ionutnechita";
		githubId = 9405900;
		name = "Ionut Nechita";
		};
		iopq = {
		email = "iop_jr@yahoo.com";
		github = "iopq";
		@@ -13022,6 +13028,12 @@
		github = "ribose-jeffreylau";
		githubId = 2649467;
		};
		ricarch97 = {
		email = "ricardo.steijn97@gmail.com";
		github = "RicArch97";
		githubId = 61013287;
		name = "Ricardo Steijn";
		};
		richardipsum = {
		email = "richardipsum@fastmail.co.uk";
		github = "richardipsum";

+1 −1

Original line number	Diff line number	Diff line
		@@ -147,7 +147,7 @@ In addition to numerous new and upgraded packages, this release has the followin

		- [rstudio-server](https://www.rstudio.com/products/rstudio/#rstudio-server), a browser-based version of the RStudio IDE for the R programming language. Available as [services.rstudio-server](#opt-services.rstudio-server.enable).

		- [rtsp-simple-server](https://github.com/aler9/rtsp-simple-server), ready-to-use RTSP / RTMP / HLS server and proxy that allows to read, publish and proxy video and audio streams. Available as [services.rtsp-simple-server](#opt-services.rtsp-simple-server.enable).
		- [mediamtx](https://github.com/aler9/mediamtx), ready-to-use RTSP / RTMP / HLS server and proxy that allows to read, publish and proxy video and audio streams. Available as [services.mediamtx](#opt-services.mediamtx.enable).

		- [Snipe-IT](https://snipeitapp.com), a free open source IT asset/license management system. Available as [services.snipe-it](#opt-services.snipe-it.enable).

+2 −0

Original line number	Diff line number	Diff line
		@@ -400,6 +400,8 @@ In addition to numerous new and upgraded packages, this release has the followin

		- The `unifi-poller` package and corresponding NixOS module have been renamed to `unpoller` to match upstream.

		- The `rtsp-simple-server` package and corresponding NixOS module have been renamed to `mediamtx` to match upstream.

		- The new option `services.tailscale.useRoutingFeatures` controls various settings for using Tailscale features like exit nodes and subnet routers. If you wish to use your machine as an exit node, you can set this setting to `server`, otherwise if you wish to use an exit node you can set this setting to `client`. The strict RPF warning has been removed as the RPF will be loosened automatically based on the value of this setting.

		- `openjdk` from version 11 and above is not build with `openjfx` (i.e.: JavaFX) support by default anymore. You can re-enable it by overriding, e.g.: `openjdk11.override { enableJavaFX = true; };`.

+1 −1

Original line number	Diff line number	Diff line
		@@ -1131,7 +1131,7 @@
		./services/video/epgstation/default.nix
		./services/video/mirakurun.nix
		./services/video/replay-sorcery.nix
		./services/video/rtsp-simple-server.nix
		./services/video/mediamtx.nix
		./services/video/unifi-video.nix
		./services/video/v4l2-relayd.nix
		./services/wayland/cage.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,7 @@ with lib;
		(mkRemovedOptionModule [ "services" "openfire" ] "The corresponding package was removed from nixpkgs.")
		(mkRemovedOptionModule [ "services" "riak" ] "The corresponding package was removed from nixpkgs.")
		(mkRemovedOptionModule [ "services" "cryptpad" ] "The corresponding package was removed from nixpkgs.")
		(mkRemovedOptionModule [ "services" "rtsp-simple-server" ] "Package has been completely rebranded by upstream as mediamtx, and thus the service and the package were renamed in NixOS as well.")

		(mkRemovedOptionModule [ "i18n" "inputMethod" "fcitx" ] "The fcitx module has been removed. Plesae use fcitx5 instead")