From 4c59a99bba2b9c07535f2020a2d8f3107c0f1992 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Tue, 18 Feb 2025 17:01:58 +0100 Subject: [PATCH 1/5] synadm: split out of matrix-synapse package --- .../tools/synadm.nix => by-name/sy/synadm/package.nix} | 0 pkgs/servers/matrix-synapse/tools/default.nix | 2 -- pkgs/top-level/aliases.nix | 3 +++ 3 files changed, 3 insertions(+), 2 deletions(-) rename pkgs/{servers/matrix-synapse/tools/synadm.nix => by-name/sy/synadm/package.nix} (100%) 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 index 6f7f4e2e7b30..101711283297 100644 --- a/pkgs/servers/matrix-synapse/tools/default.nix +++ b/pkgs/servers/matrix-synapse/tools/default.nix @@ -1,6 +1,4 @@ { 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 1f24eadb8713..bedb0aebf336 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -867,6 +867,9 @@ 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 { + 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 From 4b644d14579db00c452358f990d6bdaf2ef8421b Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Tue, 18 Feb 2025 17:05:45 +0100 Subject: [PATCH 2/5] rust-synapse-state-compress: move out of matrix-synapse package --- .../ru/rust-synapse-state-compress}/Cargo.lock | 0 .../ru/rust-synapse-state-compress/package.nix} | 0 pkgs/servers/matrix-synapse/default.nix | 1 - pkgs/servers/matrix-synapse/tools/default.nix | 4 ---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 6 files changed, 1 insertion(+), 7 deletions(-) rename pkgs/{servers/matrix-synapse/tools/rust-synapse-compress-state => by-name/ru/rust-synapse-state-compress}/Cargo.lock (100%) rename pkgs/{servers/matrix-synapse/tools/rust-synapse-compress-state/default.nix => by-name/ru/rust-synapse-state-compress/package.nix} (100%) delete mode 100644 pkgs/servers/matrix-synapse/tools/default.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/default.nix b/pkgs/servers/matrix-synapse/default.nix index 18deda6ef381..c5677fe48d3a 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -14,7 +14,6 @@ let plugins = python3.pkgs.callPackage ./plugins { }; - tools = callPackage ./tools { }; in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; diff --git a/pkgs/servers/matrix-synapse/tools/default.nix b/pkgs/servers/matrix-synapse/tools/default.nix deleted file mode 100644 index 101711283297..000000000000 --- a/pkgs/servers/matrix-synapse/tools/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ callPackage }: -{ - rust-synapse-compress-state = callPackage ./rust-synapse-compress-state { }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bedb0aebf336..4f4931e09e1c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -868,6 +868,7 @@ mapAliases { 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e289c52ded44..5fa2de85822b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3942,12 +3942,10 @@ with pkgs; 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 { }; From 3be0734c12f6d9db75944835c50dd0c8eb2973d7 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Tue, 18 Feb 2025 17:08:53 +0100 Subject: [PATCH 3/5] matrix-appservice-slack: move out of matrix-synapse package --- .../ma}/matrix-appservice-slack/package.json | 0 .../ma/matrix-appservice-slack/package.nix} | 6 ++++-- .../ma}/matrix-appservice-slack/pin.json | 0 .../ma}/matrix-appservice-slack/update.sh | 0 pkgs/top-level/all-packages.nix | 4 ---- 5 files changed, 4 insertions(+), 6 deletions(-) rename pkgs/{servers/matrix-synapse => by-name/ma}/matrix-appservice-slack/package.json (100%) rename pkgs/{servers/matrix-synapse/matrix-appservice-slack/default.nix => by-name/ma/matrix-appservice-slack/package.nix} (89%) rename pkgs/{servers/matrix-synapse => by-name/ma}/matrix-appservice-slack/pin.json (100%) rename pkgs/{servers/matrix-synapse => by-name/ma}/matrix-appservice-slack/update.sh (100%) 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..c4f5f168e2e0 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, + matrix-sdk-crypto-nodejs-0_1_0-beta_3, mkYarnPackage, - nodejs, + nodejs_18, }: let data = lib.importJSON ./pin.json; + matrix-sdk-crypto-nodejs = matrix-sdk-crypto-nodejs-0_1_0-beta_3; + nodejs = nodejs_18; 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fa2de85822b..0cc0c3af25f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3943,10 +3943,6 @@ with pkgs; matrix-synapse-unwrapped = callPackage ../servers/matrix-synapse/default.nix { }; matrix-synapse-plugins = recurseIntoAttrs matrix-synapse-unwrapped.plugins; - 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 { }; maubot = with python3Packages; toPythonApplication maubot; From 4c963433da624f1f764468b20f5aad53c3c4b294 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Tue, 18 Feb 2025 17:09:46 +0100 Subject: [PATCH 4/5] matrix-synapse: move to pkgs/by-name --- .../ma/matrix-synapse-unwrapped/package.nix} | 2 +- .../ma/matrix-synapse-unwrapped}/plugins/default.nix | 0 .../ma/matrix-synapse-unwrapped}/plugins/ldap3.nix | 0 .../ma/matrix-synapse-unwrapped}/plugins/mjolnir-antispam.nix | 0 .../ma/matrix-synapse-unwrapped}/plugins/pam.nix | 0 .../ma/matrix-synapse-unwrapped}/plugins/rendezvous-Cargo.lock | 0 .../ma/matrix-synapse-unwrapped}/plugins/rendezvous.nix | 0 .../matrix-synapse-unwrapped}/plugins/s3-storage-provider.nix | 0 .../ma/matrix-synapse-unwrapped}/plugins/shared-secret-auth.nix | 0 .../wrapper.nix => by-name/ma/matrix-synapse/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 11 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{servers/matrix-synapse/default.nix => by-name/ma/matrix-synapse-unwrapped/package.nix} (99%) rename pkgs/{servers/matrix-synapse => by-name/ma/matrix-synapse-unwrapped}/plugins/default.nix (100%) rename pkgs/{servers/matrix-synapse => by-name/ma/matrix-synapse-unwrapped}/plugins/ldap3.nix (100%) rename pkgs/{servers/matrix-synapse => by-name/ma/matrix-synapse-unwrapped}/plugins/mjolnir-antispam.nix (100%) rename pkgs/{servers/matrix-synapse => by-name/ma/matrix-synapse-unwrapped}/plugins/pam.nix (100%) rename pkgs/{servers/matrix-synapse => by-name/ma/matrix-synapse-unwrapped}/plugins/rendezvous-Cargo.lock (100%) rename pkgs/{servers/matrix-synapse => by-name/ma/matrix-synapse-unwrapped}/plugins/rendezvous.nix (100%) rename pkgs/{servers/matrix-synapse => by-name/ma/matrix-synapse-unwrapped}/plugins/s3-storage-provider.nix (100%) rename pkgs/{servers/matrix-synapse => by-name/ma/matrix-synapse-unwrapped}/plugins/shared-secret-auth.nix (100%) rename pkgs/{servers/matrix-synapse/wrapper.nix => by-name/ma/matrix-synapse/package.nix} (100%) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix similarity index 99% rename from pkgs/servers/matrix-synapse/default.nix rename to pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index c5677fe48d3a..080bdd66bbc9 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix @@ -176,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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0cc0c3af25f5..278cc5f41844 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3939,8 +3939,6 @@ 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-appservice-discord = callPackage ../servers/matrix-appservice-discord { }; From 900ec4b03e527c9a204eff19ec4ff260c44774cb Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Tue, 18 Feb 2025 16:57:35 +0100 Subject: [PATCH 5/5] matrix-appservice-slack: move matrix-sdk-crypto-nodejs@0.1.0-beta3 into subfolder --- .../matrix-sdk-crypto-nodejs-0_1_0-beta_3}/Cargo-beta.3.lock | 0 .../matrix-sdk-crypto-nodejs-0_1_0-beta_3/package.nix} | 0 .../remove-duplicate-dependency.patch | 0 pkgs/by-name/ma/matrix-appservice-slack/package.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 5 files changed, 2 insertions(+), 3 deletions(-) rename pkgs/{development/libraries/matrix-sdk-crypto-nodejs => by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3}/Cargo-beta.3.lock (100%) rename pkgs/{development/libraries/matrix-sdk-crypto-nodejs/beta3.nix => by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3/package.nix} (100%) rename pkgs/{development/libraries/matrix-sdk-crypto-nodejs => by-name/ma/matrix-appservice-slack/matrix-sdk-crypto-nodejs-0_1_0-beta_3}/remove-duplicate-dependency.patch (100%) 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/by-name/ma/matrix-appservice-slack/package.nix b/pkgs/by-name/ma/matrix-appservice-slack/package.nix index c4f5f168e2e0..b37ebccbf2f2 100644 --- a/pkgs/by-name/ma/matrix-appservice-slack/package.nix +++ b/pkgs/by-name/ma/matrix-appservice-slack/package.nix @@ -3,15 +3,15 @@ fetchFromGitHub, fetchYarnDeps, makeWrapper, - matrix-sdk-crypto-nodejs-0_1_0-beta_3, mkYarnPackage, nodejs_18, + callPackage, }: let data = lib.importJSON ./pin.json; - matrix-sdk-crypto-nodejs = matrix-sdk-crypto-nodejs-0_1_0-beta_3; 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 278cc5f41844..af3d392a0330 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4156,7 +4156,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 { };