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

Merge master into staging-next

parents 6794b439 6a39c6e4
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@

- `pkgs.nextcloud28` has been removed since it's out of support upstream.

- `centrifugo` was updated to v6, which uses a new config format. See [upstream documentation](https://centrifugal.dev/docs/getting-started/migration_v6) for migration.

- `teleport` has been upgraded from major version 16 to major version 17.
  Refer to [upstream upgrade instructions](https://goteleport.com/docs/upgrading/overview/)
  and [release notes for v17](https://goteleport.com/docs/changelog/#1701-11152024).
@@ -283,6 +285,7 @@
- `docker_24` has been removed, as it was EOL with vulnerabilities since June 08, 2024.

- Emacs 28 and 29 have been removed.
- Emacs 28 Macport has been removed, while CVEs of Emacs 29 Macport are patched.

- `containerd` has been updated to v2, which contains breaking changes. See the [containerd
  2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more
+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@

builtins.mapAttrs (
  attr: pkg:
  if lib.versionAtLeast pkg.version "2.26" then
  if lib.versionAtLeast pkg.version "2.29pre" then
    pkg.overrideScope (finalScope: prevScope: { aws-sdk-cpp = null; })
  else
    pkg.override { withAWS = false; }
+6 −0
Original line number Diff line number Diff line
@@ -5006,6 +5006,12 @@
    name = "Daniel McCarney";
    keys = [ { fingerprint = "8026 D24A A966 BF9C D3CD  CB3C 08FB 2BFC 470E 75B4"; } ];
  };
  cr0n = {
    name = "cr0n";
    github = "n0rc";
    githubId = 355000;
    email = "cr0n@cypherpunks.cc";
  };
  Crafter = {
    email = "crafter@crafter.rocks";
    github = "Craftzman7";
+8 −0
Original line number Diff line number Diff line
@@ -65,6 +65,14 @@ in
  };

  config = lib.mkIf cfg.enable {
    assertions = [
      {
        assertion =
          (lib.versionAtLeast cfg.package.version "6") -> (!(cfg.settings ? name) && !(cfg.settings ? port));
        message = "`services.centrifugo.settings` is v5 config, must be compatible with centrifugo v6 config format";
      }
    ];

    systemd.services.centrifugo = {
      description = "Centrifugo messaging server";
      wantedBy = [ "multi-user.target" ];
+13 −9
Original line number Diff line number Diff line
@@ -10,7 +10,10 @@ in
{ lib, ... }:
{
  name = "centrifugo";
  meta.maintainers = [ lib.maintainers.tie ];
  meta.maintainers = [
    lib.maintainers.tie
    lib.maintainers.valodim
  ];

  nodes = lib.listToAttrs (
    lib.imap0 (index: name: {
@@ -21,12 +24,15 @@ in
          services.centrifugo = {
            enable = true;
            settings = {
              node = {
                inherit name;
              port = centrifugoPort;
              # See https://centrifugal.dev/docs/server/engines#redis-sharding
              engine = "redis";
              # Connect to local Redis shard via Unix socket.
              redis_address =
              };
              http_server.port = centrifugoPort;
              http_api.insecure = true;
              usage_stats.disabled = true;

              engine.type = "redis";
              engine.redis.address =
                let
                  toRedisAddresses = map (name: "${name}:${toString redisPort}");
                in
@@ -35,8 +41,6 @@ in
                  "unix://${config.services.redis.servers.centrifugo.unixSocket}"
                ]
                ++ toRedisAddresses (lib.drop (index + 1) nodes);
              usage_stats_disable = true;
              api_insecure = true;
            };
            extraGroups = [
              config.services.redis.servers.centrifugo.user
Loading