Unverified Commit 4c3edba8 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #225750 from r-ryantm/auto-update/rtsp-simple-server

rtsp-simple-server: 0.21.6 -> 0.22.0
parents 471280a5 197ed8e7
Loading
Loading
Loading
Loading
+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")

+16 −16
Original line number Diff line number Diff line
@@ -3,19 +3,19 @@
with lib;

let
  cfg = config.services.rtsp-simple-server;
  package = pkgs.rtsp-simple-server;
  cfg = config.services.mediamtx;
  package = pkgs.mediamtx;
  format = pkgs.formats.yaml {};
in
{
  options = {
    services.rtsp-simple-server = {
      enable = mkEnableOption (lib.mdDoc "RTSP Simple Server");
    services.mediamtx = {
      enable = mkEnableOption (lib.mdDoc "MediaMTX");

      settings = mkOption {
        description = lib.mdDoc ''
          Settings for rtsp-simple-server.
          Read more at <https://github.com/aler9/rtsp-simple-server/blob/main/rtsp-simple-server.yml>
          Settings for MediaMTX.
          Read more at <https://github.com/aler9/mediamtx/blob/main/mediamtx.yml>
        '';
        type = format.type;

@@ -25,7 +25,7 @@ in
            "stdout"
          ];
          # we set this so when the user uses it, it just works (see LogsDirectory below). but it's not used by default.
          logFile = "/var/log/rtsp-simple-server/rtsp-simple-server.log";
          logFile = "/var/log/mediamtx/mediamtx.log";
        };

        example = {
@@ -40,20 +40,20 @@ in

      env = mkOption {
        type = with types; attrsOf anything;
        description = lib.mdDoc "Extra environment variables for RTSP Simple Server";
        description = lib.mdDoc "Extra environment variables for MediaMTX";
        default = {};
        example = {
          RTSP_CONFKEY = "mykey";
          MTX_CONFKEY = "mykey";
        };
      };
    };
  };

  config = mkIf (cfg.enable) {
    # NOTE: rtsp-simple-server watches this file and automatically reloads if it changes
    environment.etc."rtsp-simple-server.yaml".source = format.generate "rtsp-simple-server.yaml" cfg.settings;
    # NOTE: mediamtx watches this file and automatically reloads if it changes
    environment.etc."mediamtx.yaml".source = format.generate "mediamtx.yaml" cfg.settings;

    systemd.services.rtsp-simple-server = {
    systemd.services.mediamtx = {
      environment = cfg.env;

      after = [ "network.target" ];
@@ -65,15 +65,15 @@ in

      serviceConfig = {
        DynamicUser = true;
        User = "rtsp-simple-server";
        Group = "rtsp-simple-server";
        User = "mediamtx";
        Group = "mediamtx";

        LogsDirectory = "rtsp-simple-server";
        LogsDirectory = "mediamtx";

        # user likely may want to stream cameras, can't hurt to add video group
        SupplementaryGroups = "video";

        ExecStart = "${package}/bin/rtsp-simple-server /etc/rtsp-simple-server.yaml";
        ExecStart = "${package}/bin/mediamtx /etc/mediamtx.yaml";
      };
    };
  };
Loading