diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo-beta.3.lock b/pkgs/by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3/Cargo-beta.3.lock similarity index 100% rename from pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo-beta.3.lock rename to pkgs/by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3/Cargo-beta.3.lock diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/beta3.nix b/pkgs/by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3/package.nix similarity index 100% rename from pkgs/development/libraries/matrix-sdk-crypto-nodejs/beta3.nix rename to pkgs/by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3/package.nix diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/remove-duplicate-dependency.patch b/pkgs/by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3/remove-duplicate-dependency.patch similarity index 100% rename from pkgs/development/libraries/matrix-sdk-crypto-nodejs/remove-duplicate-dependency.patch rename to pkgs/by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3/remove-duplicate-dependency.patch diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json b/pkgs/by-name/ma/matrix-appservice-slack/package.json similarity index 100% rename from pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json rename to pkgs/by-name/ma/matrix-appservice-slack/package.json diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/pkgs/by-name/ma/matrix-appservice-slack/package.nix similarity index 89% rename from pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix rename to pkgs/by-name/ma/matrix-appservice-slack/package.nix index 1407bda88886..b37ebccbf2f2 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix +++ b/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; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json b/pkgs/by-name/ma/matrix-appservice-slack/pin.json similarity index 100% rename from pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json rename to pkgs/by-name/ma/matrix-appservice-slack/pin.json diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/update.sh b/pkgs/by-name/ma/matrix-appservice-slack/update.sh similarity index 100% rename from pkgs/servers/matrix-synapse/matrix-appservice-slack/update.sh rename to pkgs/by-name/ma/matrix-appservice-slack/update.sh diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix similarity index 98% rename from pkgs/servers/matrix-synapse/default.nix rename to pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index 18deda6ef381..080bdd66bbc9 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/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; }; diff --git a/pkgs/servers/matrix-synapse/plugins/default.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/default.nix similarity index 100% rename from pkgs/servers/matrix-synapse/plugins/default.nix rename to pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/default.nix diff --git a/pkgs/servers/matrix-synapse/plugins/ldap3.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/ldap3.nix similarity index 100% rename from pkgs/servers/matrix-synapse/plugins/ldap3.nix rename to pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/ldap3.nix diff --git a/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/mjolnir-antispam.nix similarity index 100% rename from pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix rename to pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/mjolnir-antispam.nix diff --git a/pkgs/servers/matrix-synapse/plugins/pam.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/pam.nix similarity index 100% rename from pkgs/servers/matrix-synapse/plugins/pam.nix rename to pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/pam.nix diff --git a/pkgs/servers/matrix-synapse/plugins/rendezvous-Cargo.lock b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/rendezvous-Cargo.lock similarity index 100% rename from pkgs/servers/matrix-synapse/plugins/rendezvous-Cargo.lock rename to pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/rendezvous-Cargo.lock diff --git a/pkgs/servers/matrix-synapse/plugins/rendezvous.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/rendezvous.nix similarity index 100% rename from pkgs/servers/matrix-synapse/plugins/rendezvous.nix rename to pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/rendezvous.nix diff --git a/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix similarity index 100% rename from pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix rename to pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix diff --git a/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/shared-secret-auth.nix similarity index 100% rename from pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix rename to pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/shared-secret-auth.nix diff --git a/pkgs/servers/matrix-synapse/wrapper.nix b/pkgs/by-name/ma/matrix-synapse/package.nix similarity index 100% rename from pkgs/servers/matrix-synapse/wrapper.nix rename to pkgs/by-name/ma/matrix-synapse/package.nix diff --git a/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state/Cargo.lock b/pkgs/by-name/ru/rust-synapse-state-compress/Cargo.lock similarity index 100% rename from pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state/Cargo.lock rename to pkgs/by-name/ru/rust-synapse-state-compress/Cargo.lock diff --git a/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state/default.nix b/pkgs/by-name/ru/rust-synapse-state-compress/package.nix similarity index 100% rename from pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state/default.nix rename to pkgs/by-name/ru/rust-synapse-state-compress/package.nix diff --git a/pkgs/servers/matrix-synapse/tools/synadm.nix b/pkgs/by-name/sy/synadm/package.nix similarity index 100% rename from pkgs/servers/matrix-synapse/tools/synadm.nix rename to pkgs/by-name/sy/synadm/package.nix diff --git a/pkgs/servers/matrix-synapse/tools/default.nix b/pkgs/servers/matrix-synapse/tools/default.nix deleted file mode 100644 index 6f7f4e2e7b30..000000000000 --- a/pkgs/servers/matrix-synapse/tools/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage }: -{ - rust-synapse-compress-state = callPackage ./rust-synapse-compress-state { }; - - synadm = callPackage ./synadm.nix { }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 64e5b08ce7b6..d000a8079824 100644 --- a/pkgs/top-level/aliases.nix +++ b/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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af6e28b872d3..cd41246c6efd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 { };