Skip to content

Commit

Permalink
matrix-sliding-sync: drop (#350095)
Browse files Browse the repository at this point in the history
  • Loading branch information
emilylange authored Oct 21, 2024
2 parents ab61090 + 6306bf7 commit dfd24c1
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 147 deletions.
2 changes: 2 additions & 0 deletions nixos/doc/manual/release-notes/rl-2411.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,8 @@
- `nodePackages.coc-metals` was removed due to being deprecated upstream.
`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.
Refer to upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/)
and [release notes for v16](https://goteleport.com/docs/changelog/#1600-061324).
Expand Down
1 change: 0 additions & 1 deletion nixos/modules/module-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,6 @@
./services/matrix/mjolnir.nix
./services/matrix/mx-puppet-discord.nix
./services/matrix/pantalaimon.nix
./services/matrix/matrix-sliding-sync.nix
./services/matrix/synapse.nix
./services/misc/airsonic.nix
./services/misc/amazon-ssm-agent.nix
Expand Down
1 change: 1 addition & 0 deletions nixos/modules/rename.nix
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ in
(mkRemovedOptionModule [ "services" "mailpile" ] "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" "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" "mesos" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "mxisd" ] "The mxisd module has been removed as both mxisd and ma1sd got removed.")
Expand Down
107 changes: 0 additions & 107 deletions nixos/modules/services/matrix/matrix-sliding-sync.nix

This file was deleted.

37 changes: 0 additions & 37 deletions pkgs/servers/matrix-synapse/sliding-sync/default.nix

This file was deleted.

1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1026,6 +1026,7 @@ mapAliases {
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
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-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
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9242,8 +9242,6 @@ with pkgs;

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-unwrapped = callPackage ../servers/matrix-synapse/default.nix { };
matrix-synapse-plugins = recurseIntoAttrs matrix-synapse-unwrapped.plugins;
Expand Down

0 comments on commit dfd24c1

Please sign in to comment.