matrix-sliding-sync: drop
On the 2024 matrix conference the EOL for the sliding-sync-proxy was announced to be 2024-10-15. While the repo does not yet reflect that state, we should not be taking the the sliding-sync proxy into NixOS 24.11 under any circumstances.
This commit is contained in:
parent
322eb94b18
commit
6306bf790e
@ -365,6 +365,8 @@
|
|||||||
- `nodePackages.coc-metals` was removed due to being deprecated upstream.
|
- `nodePackages.coc-metals` was removed due to being deprecated upstream.
|
||||||
`vimPlugins.nvim-metals` is its official replacement.
|
`vimPlugins.nvim-metals` is its official replacement.
|
||||||
|
|
||||||
|
- `matrix-sliding-sync` was removed because it has been replaced by the simplified sliding sync functionality introduced in matrix-synapse 114.0.
|
||||||
|
|
||||||
- `teleport` has been upgraded from major version 15 to major version 16.
|
- `teleport` has been upgraded from major version 15 to major version 16.
|
||||||
Refer to upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/)
|
Refer to upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/)
|
||||||
and [release notes for v16](https://goteleport.com/docs/changelog/#1600-061324).
|
and [release notes for v16](https://goteleport.com/docs/changelog/#1600-061324).
|
||||||
|
@ -711,7 +711,6 @@
|
|||||||
./services/matrix/mjolnir.nix
|
./services/matrix/mjolnir.nix
|
||||||
./services/matrix/mx-puppet-discord.nix
|
./services/matrix/mx-puppet-discord.nix
|
||||||
./services/matrix/pantalaimon.nix
|
./services/matrix/pantalaimon.nix
|
||||||
./services/matrix/matrix-sliding-sync.nix
|
|
||||||
./services/matrix/synapse.nix
|
./services/matrix/synapse.nix
|
||||||
./services/misc/airsonic.nix
|
./services/misc/airsonic.nix
|
||||||
./services/misc/amazon-ssm-agent.nix
|
./services/misc/amazon-ssm-agent.nix
|
||||||
|
@ -87,6 +87,7 @@ in
|
|||||||
(mkRemovedOptionModule [ "services" "mailpile" ] "The corresponding package was removed from nixpkgs.")
|
(mkRemovedOptionModule [ "services" "mailpile" ] "The corresponding package was removed from nixpkgs.")
|
||||||
(mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.")
|
(mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.")
|
||||||
(mkRemovedOptionModule [ "services" "mathics" ] "The Mathics module has been removed")
|
(mkRemovedOptionModule [ "services" "mathics" ] "The Mathics module has been removed")
|
||||||
|
(mkRemovedOptionModule [ "services" "matrix-sliding-sync" ] "The matrix-sliding-sync package has been removed, since matrix-synapse incorporated its functionality")
|
||||||
(mkRemovedOptionModule [ "services" "meguca" ] "Use meguca has been removed from nixpkgs")
|
(mkRemovedOptionModule [ "services" "meguca" ] "Use meguca has been removed from nixpkgs")
|
||||||
(mkRemovedOptionModule [ "services" "mesos" ] "The corresponding package was removed from nixpkgs.")
|
(mkRemovedOptionModule [ "services" "mesos" ] "The corresponding package was removed from nixpkgs.")
|
||||||
(mkRemovedOptionModule [ "services" "mxisd" ] "The mxisd module has been removed as both mxisd and ma1sd got removed.")
|
(mkRemovedOptionModule [ "services" "mxisd" ] "The mxisd module has been removed as both mxisd and ma1sd got removed.")
|
||||||
|
@ -1,107 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
cfg = config.services.matrix-sliding-sync;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
(lib.mkRenamedOptionModule [ "services" "matrix-synapse" "sliding-sync" ] [ "services" "matrix-sliding-sync" ])
|
|
||||||
];
|
|
||||||
|
|
||||||
options.services.matrix-sliding-sync = {
|
|
||||||
enable = lib.mkEnableOption "sliding sync";
|
|
||||||
|
|
||||||
package = lib.mkPackageOption pkgs "matrix-sliding-sync" { };
|
|
||||||
|
|
||||||
settings = lib.mkOption {
|
|
||||||
type = lib.types.submodule {
|
|
||||||
freeformType = with lib.types; attrsOf str;
|
|
||||||
options = {
|
|
||||||
SYNCV3_SERVER = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
description = ''
|
|
||||||
The destination homeserver to talk to not including `/_matrix/` e.g `https://matrix.example.org`.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
SYNCV3_DB = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
default = "postgresql:///matrix-sliding-sync?host=/run/postgresql";
|
|
||||||
description = ''
|
|
||||||
The postgres connection string.
|
|
||||||
Refer to <https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING>.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
SYNCV3_BINDADDR = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
default = "127.0.0.1:8009";
|
|
||||||
example = "[::]:8008";
|
|
||||||
description = "The interface and port or path (for unix socket) to listen on.";
|
|
||||||
};
|
|
||||||
|
|
||||||
SYNCV3_LOG_LEVEL = lib.mkOption {
|
|
||||||
type = lib.types.enum [ "trace" "debug" "info" "warn" "error" "fatal" ];
|
|
||||||
default = "info";
|
|
||||||
description = "The level of verbosity for messages logged.";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
default = { };
|
|
||||||
description = ''
|
|
||||||
Freeform environment variables passed to the sliding sync proxy.
|
|
||||||
Refer to <https://github.com/matrix-org/sliding-sync#setup> for all supported values.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
createDatabase = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
default = true;
|
|
||||||
description = ''
|
|
||||||
Whether to enable and configure `services.postgres` to ensure that the database user `matrix-sliding-sync`
|
|
||||||
and the database `matrix-sliding-sync` exist.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
environmentFile = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
description = ''
|
|
||||||
Environment file as defined in {manpage}`systemd.exec(5)`.
|
|
||||||
|
|
||||||
This must contain the {env}`SYNCV3_SECRET` variable which should
|
|
||||||
be generated with {command}`openssl rand -hex 32`.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
services.postgresql = lib.optionalAttrs cfg.createDatabase {
|
|
||||||
enable = true;
|
|
||||||
ensureDatabases = [ "matrix-sliding-sync" ];
|
|
||||||
ensureUsers = [ {
|
|
||||||
name = "matrix-sliding-sync";
|
|
||||||
ensureDBOwnership = true;
|
|
||||||
} ];
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services.matrix-sliding-sync = rec {
|
|
||||||
after =
|
|
||||||
lib.optional cfg.createDatabase "postgresql.service"
|
|
||||||
++ lib.optional config.services.dendrite.enable "dendrite.service"
|
|
||||||
++ lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit;
|
|
||||||
wants = after;
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
environment = cfg.settings;
|
|
||||||
serviceConfig = {
|
|
||||||
DynamicUser = true;
|
|
||||||
EnvironmentFile = cfg.environmentFile;
|
|
||||||
ExecStart = lib.getExe cfg.package;
|
|
||||||
StateDirectory = "matrix-sliding-sync";
|
|
||||||
WorkingDirectory = "%S/matrix-sliding-sync";
|
|
||||||
RuntimeDirectory = "matrix-sliding-sync";
|
|
||||||
Restart = "on-failure";
|
|
||||||
RestartSec = "1s";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,37 +0,0 @@
|
|||||||
{ lib
|
|
||||||
, buildGoModule
|
|
||||||
, fetchFromGitHub
|
|
||||||
}:
|
|
||||||
|
|
||||||
buildGoModule rec {
|
|
||||||
pname = "matrix-sliding-sync";
|
|
||||||
version = "0.99.19";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "matrix-org";
|
|
||||||
repo = "sliding-sync";
|
|
||||||
rev = "refs/tags/v${version}";
|
|
||||||
hash = "sha256-w4VL+MioNeJ/R48Ln9tYaqlfg7NvT3mQs0dWOZTHQK4=";
|
|
||||||
};
|
|
||||||
|
|
||||||
vendorHash = "sha256-THjvc0TepIBFOTte7t63Dmadf3HMuZ9m0YzQMI5e5Pw=";
|
|
||||||
|
|
||||||
subPackages = [ "cmd/syncv3" ];
|
|
||||||
|
|
||||||
ldflags = [
|
|
||||||
"-s"
|
|
||||||
"-w"
|
|
||||||
"-X main.GitCommit=${src.rev}"
|
|
||||||
];
|
|
||||||
|
|
||||||
# requires a running matrix-synapse
|
|
||||||
doCheck = false;
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Sliding sync implementation of MSC3575 for matrix";
|
|
||||||
homepage = "https://github.com/matrix-org/sliding-sync";
|
|
||||||
license = with licenses; [ asl20 ];
|
|
||||||
maintainers = with maintainers; [ emilylange yayayayaka ];
|
|
||||||
mainProgram = "syncv3";
|
|
||||||
};
|
|
||||||
}
|
|
@ -1026,6 +1026,7 @@ mapAliases {
|
|||||||
matrique = throw "'matrique' has been renamed to/replaced by 'spectral'"; # Converted to throw 2024-10-17
|
matrique = throw "'matrique' has been renamed to/replaced by 'spectral'"; # Converted to throw 2024-10-17
|
||||||
matrixcli = throw "'matrixcli' has been removed due to being unmaintained and broken functionality. Recommend 'matrix-commander' as an alternative"; # Added 2024-03-09
|
matrixcli = throw "'matrixcli' has been removed due to being unmaintained and broken functionality. Recommend 'matrix-commander' as an alternative"; # Added 2024-03-09
|
||||||
matrix-recorder = throw "matrix-recorder has been removed due to being unmaintained"; # Added 2023-05-21
|
matrix-recorder = throw "matrix-recorder has been removed due to being unmaintained"; # Added 2023-05-21
|
||||||
|
matrix-sliding-sync = throw "matrix-sliding-sync has been removed as matrix-synapse 114.0 and later covers its functionality"; # Added 2024-10-20
|
||||||
maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17
|
maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17
|
||||||
maui-shell = throw "maui-shell has been removed from nixpkgs, it was broken"; # Added 2024-07-15
|
maui-shell = throw "maui-shell has been removed from nixpkgs, it was broken"; # Added 2024-07-15
|
||||||
mbox = throw "'mbox' has been removed, as it was broken and unmaintained"; # Added 2023-12-21
|
mbox = throw "'mbox' has been removed, as it was broken and unmaintained"; # Added 2023-12-21
|
||||||
|
@ -9242,8 +9242,6 @@ with pkgs;
|
|||||||
|
|
||||||
matrix-conduit = callPackage ../servers/matrix-conduit { };
|
matrix-conduit = callPackage ../servers/matrix-conduit { };
|
||||||
|
|
||||||
matrix-sliding-sync = callPackage ../servers/matrix-synapse/sliding-sync { };
|
|
||||||
|
|
||||||
matrix-synapse = callPackage ../servers/matrix-synapse/wrapper.nix { };
|
matrix-synapse = callPackage ../servers/matrix-synapse/wrapper.nix { };
|
||||||
matrix-synapse-unwrapped = callPackage ../servers/matrix-synapse/default.nix { };
|
matrix-synapse-unwrapped = callPackage ../servers/matrix-synapse/default.nix { };
|
||||||
matrix-synapse-plugins = recurseIntoAttrs matrix-synapse-unwrapped.plugins;
|
matrix-synapse-plugins = recurseIntoAttrs matrix-synapse-unwrapped.plugins;
|
||||||
|
Loading…
Reference in New Issue
Block a user