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

Changed files
+9 -19
pkgs
by-name
servers
matrix-synapse
tools
top-level
pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo-beta.3.lock pkgs/by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3/Cargo-beta.3.lock
pkgs/development/libraries/matrix-sdk-crypto-nodejs/beta3.nix pkgs/by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3/package.nix
pkgs/development/libraries/matrix-sdk-crypto-nodejs/remove-duplicate-dependency.patch pkgs/by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3/remove-duplicate-dependency.patch
+1 -2
pkgs/servers/matrix-synapse/default.nix pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
···
let
plugins = python3.pkgs.callPackage ./plugins { };
-
tools = callPackage ./tools { };
in
python3.pkgs.buildPythonApplication rec {
pname = "matrix-synapse";
···
passthru = {
tests = { inherit (nixosTests) matrix-synapse matrix-synapse-workers; };
-
inherit plugins tools;
python = python3;
};
···
let
plugins = python3.pkgs.callPackage ./plugins { };
in
python3.pkgs.buildPythonApplication rec {
pname = "matrix-synapse";
···
passthru = {
tests = { inherit (nixosTests) matrix-synapse matrix-synapse-workers; };
+
inherit plugins;
python = python3;
};
+4 -2
pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix pkgs/by-name/ma/matrix-appservice-slack/package.nix
···
fetchFromGitHub,
fetchYarnDeps,
makeWrapper,
-
matrix-sdk-crypto-nodejs,
mkYarnPackage,
-
nodejs,
}:
let
data = lib.importJSON ./pin.json;
in
mkYarnPackage rec {
inherit nodejs;
···
fetchFromGitHub,
fetchYarnDeps,
makeWrapper,
mkYarnPackage,
+
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/servers/matrix-synapse/matrix-appservice-slack/package.json pkgs/by-name/ma/matrix-appservice-slack/package.json
pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json pkgs/by-name/ma/matrix-appservice-slack/pin.json
pkgs/servers/matrix-synapse/matrix-appservice-slack/update.sh pkgs/by-name/ma/matrix-appservice-slack/update.sh
pkgs/servers/matrix-synapse/plugins/default.nix pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/default.nix
pkgs/servers/matrix-synapse/plugins/ldap3.nix pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/ldap3.nix
pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/mjolnir-antispam.nix
pkgs/servers/matrix-synapse/plugins/pam.nix pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/pam.nix
pkgs/servers/matrix-synapse/plugins/rendezvous-Cargo.lock pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/rendezvous-Cargo.lock
pkgs/servers/matrix-synapse/plugins/rendezvous.nix pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/rendezvous.nix
pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix
pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/shared-secret-auth.nix
-6
pkgs/servers/matrix-synapse/tools/default.nix
···
-
{ callPackage }:
-
{
-
rust-synapse-compress-state = callPackage ./rust-synapse-compress-state { };
-
-
synadm = callPackage ./synadm.nix { };
-
}
···
pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state/Cargo.lock pkgs/by-name/ru/rust-synapse-state-compress/Cargo.lock
pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state/default.nix pkgs/by-name/ru/rust-synapse-state-compress/package.nix
pkgs/servers/matrix-synapse/tools/synadm.nix pkgs/by-name/sy/synadm/package.nix
pkgs/servers/matrix-synapse/wrapper.nix pkgs/by-name/ma/matrix-synapse/package.nix
+4
pkgs/top-level/aliases.nix
···
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
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
···
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
-9
pkgs/top-level/all-packages.nix
···
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 { };
···
};
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 { };
···
maskromtool = qt6Packages.callPackage ../tools/graphics/maskromtool { };
matrix-synapse-plugins = recurseIntoAttrs matrix-synapse-unwrapped.plugins;
matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord { };
···
};
matrix-sdk-crypto-nodejs = callPackage ../development/libraries/matrix-sdk-crypto-nodejs { };
makemkv = libsForQt5.callPackage ../applications/video/makemkv { };