Unverified Commit e8707f82 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents 4e61a639 c9f97ce3

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

+4 −0
Original line number Diff line number Diff line
@@ -301,6 +301,10 @@ 
- `searx` was updated to use `envsubst` instead of `sed` for parsing secrets from environment variables.

  If your previous configuration included a secret reference like `server.secret_key = "@SEARX_SECRET_KEY@"`, you must migrate to the new envsubst syntax: `server.secret_key = "$SEARX_SECRET_KEY"`.



- `jellyfin` was updated to `10.11.x`, which includes heavy backend changes.

  Make sure to backup your data and configuration directories

  and read the [Jellyfin 10.11.0 release announcement](https://jellyfin.org/posts/jellyfin-release-10.11.0/).



- A new hardening flag, `glibcxxassertions` was made available, corresponding to the glibc `_GLIBCXX_ASSERTIONS` option.



- `versionCheckHook`: Packages that previously relied solely on `pname` to locate the program used to version check, but have a differing `meta.mainProgram` entry, might now fail.

maintainers/maintainer-list.nix

+5 −0
Original line number Diff line number Diff line
@@ -23091,6 +23091,11 @@ 
    githubId = 99875823;

    name = "Michael Savedra";

  };

  savtrip = {

    github = "savtrip";

    githubId = 42227195;

    name = "Sav Tripodi";

  };

  savyajha = {

    email = "savya.jha@hawkradius.com";

    github = "savyajha";

maintainers/team-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ with lib.maintainers; 
      happysalada

      minijackson

      yurrriq

      savtrip

    ];

    github = "beam";

    scope = "Maintain BEAM-related packages and modules.";

nixos/modules/security/rtkit.nix

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ in 
        ];



        # Needs to verify the user of the processes.

        PrivateUsers = "full";

        PrivateUsers = false;

        # Needs to access other processes to modify their scheduling modes.

        ProcSubset = "all";

        ProtectProc = "default";

nixos/tests/jellyfin.nix

+8 −7
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ 
  name = "jellyfin";

  meta.maintainers = with lib.maintainers; [ minijackson ];



  nodes.machine =

    { ... }:

    {

  nodes.machine = {

    services.jellyfin.enable = true;

    environment.systemPackages = with pkgs; [ ffmpeg ];

    # Jellyfin fails to start if the data dir doesn't have at least 2GiB of free space

    virtualisation.diskSize = 3 * 1024;

  };



  # Documentation of the Jellyfin API: https://api.jellyfin.org/
@@ -30,6 +30,7 @@ 


      machine.wait_for_unit("jellyfin.service")

      machine.wait_for_open_port(8096)

      machine.wait_until_succeeds("journalctl --since -1m --unit jellyfin --grep 'Startup complete'")

      machine.succeed("curl --fail http://localhost:8096/")



      machine.wait_until_succeeds("curl --fail http://localhost:8096/health | grep Healthy")
@@ -105,7 +106,7 @@ 
          folders_str = machine.succeed(api_get("/Library/VirtualFolders"))

          folders = json.loads(folders_str)

          print(folders)

          return all(folder["RefreshStatus"] == "Idle" for folder in folders)

          return all(folder.get("RefreshStatus") == "Idle" for folder in folders)





      retry(is_refreshed)