From 90d18d00f75e1001343c9856940ae68c0f23880e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 12 Jul 2026 14:13:07 -0700 Subject: [PATCH 1/2] maubot: remove from python3Packages --- .../maubot/default.nix => by-name/ma/maubot/package.nix} | 6 ++++-- .../ma}/maubot/plugins/default.nix | 0 .../ma}/maubot/plugins/generated.json | 0 .../ma}/maubot/plugins/generated.nix | 7 +++++-- .../python-modules => by-name/ma}/maubot/plugins/update.py | 4 ++-- .../python-modules => by-name/ma}/maubot/wrapper.nix | 0 pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 9 files changed, 12 insertions(+), 10 deletions(-) rename pkgs/{development/python-modules/maubot/default.nix => by-name/ma/maubot/package.nix} (96%) rename pkgs/{development/python-modules => by-name/ma}/maubot/plugins/default.nix (100%) rename pkgs/{development/python-modules => by-name/ma}/maubot/plugins/generated.json (100%) rename pkgs/{development/python-modules => by-name/ma}/maubot/plugins/generated.nix (92%) rename pkgs/{development/python-modules => by-name/ma}/maubot/plugins/update.py (97%) rename pkgs/{development/python-modules => by-name/ma}/maubot/wrapper.nix (100%) diff --git a/pkgs/development/python-modules/maubot/default.nix b/pkgs/by-name/ma/maubot/package.nix similarity index 96% rename from pkgs/development/python-modules/maubot/default.nix rename to pkgs/by-name/ma/maubot/package.nix index b0414455e4a1..c54eaac72d90 100644 --- a/pkgs/development/python-modules/maubot/default.nix +++ b/pkgs/by-name/ma/maubot/package.nix @@ -4,13 +4,15 @@ fetchpatch, callPackage, runCommand, - python, + python3, encryptionSupport ? true, sqliteSupport ? true, }: let - maubot = python.pkgs.buildPythonPackage (finalAttrs: { + python = python3; + + maubot = python.pkgs.buildPythonApplication (finalAttrs: { pname = "maubot"; version = "0.6.0"; pyproject = true; diff --git a/pkgs/development/python-modules/maubot/plugins/default.nix b/pkgs/by-name/ma/maubot/plugins/default.nix similarity index 100% rename from pkgs/development/python-modules/maubot/plugins/default.nix rename to pkgs/by-name/ma/maubot/plugins/default.nix diff --git a/pkgs/development/python-modules/maubot/plugins/generated.json b/pkgs/by-name/ma/maubot/plugins/generated.json similarity index 100% rename from pkgs/development/python-modules/maubot/plugins/generated.json rename to pkgs/by-name/ma/maubot/plugins/generated.json diff --git a/pkgs/development/python-modules/maubot/plugins/generated.nix b/pkgs/by-name/ma/maubot/plugins/generated.nix similarity index 92% rename from pkgs/development/python-modules/maubot/plugins/generated.nix rename to pkgs/by-name/ma/maubot/plugins/generated.nix index 9e7bf10ac8c3..d463de5e5d48 100644 --- a/pkgs/development/python-modules/maubot/plugins/generated.nix +++ b/pkgs/by-name/ma/maubot/plugins/generated.nix @@ -28,8 +28,11 @@ lib.flip builtins.mapAttrs json ( dash = builtins.replaceStrings [ "_" ] [ "-" ] packageName; lowerDash = builtins.replaceStrings [ "_" ] [ "-" ] lower; in - python3.pkgs.${packageName} or python3.pkgs.${lower} or python3.pkgs.${dash} - or python3.pkgs.${lowerDash} or null + if lower == "maubot" then + null + else + python3.pkgs.${packageName} or python3.pkgs.${lower} or python3.pkgs.${dash} + or python3.pkgs.${lowerDash} or null ) (builtins.filter (x: x != "maubot" && x != null) deps); reqDeps = resolveDeps (lib.toList (manifest.dependencies or null)); diff --git a/pkgs/development/python-modules/maubot/plugins/update.py b/pkgs/by-name/ma/maubot/plugins/update.py similarity index 97% rename from pkgs/development/python-modules/maubot/plugins/update.py rename to pkgs/by-name/ma/maubot/plugins/update.py index cf154d809968..4e177fd5b42e 100755 --- a/pkgs/development/python-modules/maubot/plugins/update.py +++ b/pkgs/by-name/ma/maubot/plugins/update.py @@ -213,8 +213,8 @@ def main(): for plugin_name in os.listdir(directory): process_repo(os.path.join(directory, plugin_name), official) - if os.path.isdir("pkgs/development/python-modules/maubot/plugins"): - generated = "pkgs/development/python-modules/maubot/plugins/generated.json" + if os.path.isdir("pkgs/by-name/ma/maubot/plugins"): + generated = "pkgs/by-name/ma/maubot/plugins/generated.json" else: script_dir = os.path.dirname(os.path.realpath(__file__)) generated = os.path.join(script_dir, "generated.json") diff --git a/pkgs/development/python-modules/maubot/wrapper.nix b/pkgs/by-name/ma/maubot/wrapper.nix similarity index 100% rename from pkgs/development/python-modules/maubot/wrapper.nix rename to pkgs/by-name/ma/maubot/wrapper.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40b8b3c09319..e5176abe953a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2369,8 +2369,6 @@ with pkgs; matrix-synapse-plugins = recurseIntoAttrs matrix-synapse-unwrapped.plugins; - maubot = with python3Packages; toPythonApplication maubot; - md2gemini = with python3.pkgs; toPythonApplication md2gemini; mdcat = callPackage ../tools/text/mdcat { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 16df0610345a..f7c6c9086fe4 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -364,6 +364,7 @@ mapAliases { Markups = throw "'Markups' has been renamed to/replaced by 'markups'"; # Converted to throw 2025-10-29 mathlibtools = throw "mathlibtools has been removed because the upstream repository was archived in 2023"; # added 2025-07-09 matlink-gpapi = throw "'matlink-gpapi' has been removed as it was broken and unmaintained"; # Added 2025-11-09 + maubot = throw "'maubot' has been promoted to a top-level attribute: `pkgs.maubot`"; # added 2026-07-12 mdformat-tables = "'mdformat-tables' has been archived and replaced by 'mdformat-gfm"; # added 2025-01-25 MDP = throw "'MDP' has been renamed to/replaced by 'mdp'"; # Converted to throw 2025-10-29 MechanicalSoup = throw "'MechanicalSoup' has been renamed to/replaced by 'mechanicalsoup'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 45ba29af0334..92c07866458a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10156,8 +10156,6 @@ self: super: with self; { mattermostdriver = callPackage ../development/python-modules/mattermostdriver { }; - maubot = callPackage ../development/python-modules/maubot { }; - mautrix = callPackage ../development/python-modules/mautrix { }; mautrix-appservice = self.mautrix; # alias 2019-12-28 From 229de01b92140711618fd03dbffe2fd76325d3ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 12 Jul 2026 14:13:36 -0700 Subject: [PATCH 2/2] maubot: remove sqliteSupport --- pkgs/by-name/ma/maubot/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/ma/maubot/package.nix b/pkgs/by-name/ma/maubot/package.nix index c54eaac72d90..acaf6827f826 100644 --- a/pkgs/by-name/ma/maubot/package.nix +++ b/pkgs/by-name/ma/maubot/package.nix @@ -6,7 +6,6 @@ runCommand, python3, encryptionSupport ? true, - sqliteSupport ? true, }: let @@ -58,9 +57,6 @@ let python-olm pycryptodome unpaddedbase64 - ] - ++ lib.optionals sqliteSupport [ - sqlalchemy_1_3 ]; # used for plugin tests