mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-22 08:30:57 +00:00
maubot: remove sqliteSupport (#541202)
This commit is contained in:
@@ -4,13 +4,14 @@
|
||||
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;
|
||||
@@ -56,9 +57,6 @@ let
|
||||
python-olm
|
||||
pycryptodome
|
||||
unpaddedbase64
|
||||
]
|
||||
++ lib.optionals sqliteSupport [
|
||||
sqlalchemy_1_3
|
||||
];
|
||||
|
||||
# used for plugin tests
|
||||
@@ -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));
|
||||
@@ -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")
|
||||
@@ -2358,8 +2358,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 {
|
||||
|
||||
@@ -373,6 +373,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
|
||||
|
||||
@@ -10170,8 +10170,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
|
||||
|
||||
Reference in New Issue
Block a user