Merge: matrix-synapse: split into multiple packages in by-name (#382659)

pkgs/by-name/ma/matrix-appservice-slack/package.nix

@@ -3,13 +3,15 @@
   fetchFromGitHub,
   fetchYarnDeps,
   makeWrapper,
-  matrix-sdk-crypto-nodejs,
   mkYarnPackage,
-  nodejs,
+  nodejs_18,
+  callPackage,
 }:
 
 let
   data = lib.importJSON ./pin.json;
+  nodejs = nodejs_18;
+  matrix-sdk-crypto-nodejs = callPackage ./matrix-sdk-crypto-nodejs-0_1_0-beta_3/package.nix { };
 in
 mkYarnPackage rec {
   inherit nodejs;

pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix

@@ -14,7 +14,6 @@
 
 let
   plugins = python3.pkgs.callPackage ./plugins { };
-  tools = callPackage ./tools { };
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "matrix-synapse";
@@ -177,7 +176,7 @@ python3.pkgs.buildPythonApplication rec {
 
   passthru = {
     tests = { inherit (nixosTests) matrix-synapse matrix-synapse-workers; };
-    inherit plugins tools;
+    inherit plugins;
     python = python3;
   };
 

pkgs/servers/matrix-synapse/tools/default.nix

@@ -1,6 +0,0 @@
-{ callPackage }:
-{
-  rust-synapse-compress-state = callPackage ./rust-synapse-compress-state { };
-
-  synadm = callPackage ./synadm.nix { };
-}

pkgs/top-level/aliases.nix

@@ -875,6 +875,10 @@ mapAliases {
   matomo-beta = throw "matomo-beta has been removed as it mostly just pointed to the latest matomo release, use `matomo.overrideAttrs` to access a specific beta version instead"; # Added 2025-01-15
   matrique = throw "'matrique' has been renamed to/replaced by 'spectral'"; # Converted to throw 2024-10-17
   matrix-sliding-sync = throw "matrix-sliding-sync has been removed as matrix-synapse 114.0 and later covers its functionality"; # Added 2024-10-20
+  matrix-synapse-tools = recurseIntoAttrs {
+    rust-synapse-state-compress = lib.warnOnInstantiate "`matrix-synapse-tools.rust-synapse-compress-state` has been renamed to `rust-synapse-compress-state`" rust-synapse-state-compress;
+    synadm = lib.warnOnInstantiate "`matrix-synapse-tools.synadm` has been renamed to `synadm`" synadm;
+  }; # Added 2025-02-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
   mcomix3 = mcomix; # Added 2022-06-05

pkgs/top-level/all-packages.nix

@@ -3942,15 +3942,7 @@ with pkgs;
 
   maskromtool = qt6Packages.callPackage ../tools/graphics/maskromtool { };
 
-  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;
-  matrix-synapse-tools = recurseIntoAttrs matrix-synapse-unwrapped.tools;
-
-  matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack {
-    matrix-sdk-crypto-nodejs = matrix-sdk-crypto-nodejs-0_1_0-beta_3;
-    nodejs = nodejs_18;
-  };
 
   matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord { };
 
@@ -4167,7 +4159,6 @@ with pkgs;
   };
 
   matrix-sdk-crypto-nodejs = callPackage ../development/libraries/matrix-sdk-crypto-nodejs { };
-  matrix-sdk-crypto-nodejs-0_1_0-beta_3 = callPackage ../development/libraries/matrix-sdk-crypto-nodejs/beta3.nix { };
 
   makemkv = libsForQt5.callPackage ../applications/video/makemkv { };