cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #259688 from chayleaf/maubot

Browse source 
maubot: 0.4.1 -> 0.4.2
This commit is contained in:
asymmetric 2023-10-17 12:22:27 +02:00 committed by GitHub
commit 7f3b0a30cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
pkgs/tools/networking/maubot/default.nix
View file

@ -17,25 +17,6 @@ let
hash = "sha256-yPGSKqjOz1EY5/V0oKz2EiZ90q2O4TINoXdxHuB7Gqk="; hash = "sha256-yPGSKqjOz1EY5/V0oKz2EiZ90q2O4TINoXdxHuB7Gqk=";
}; };
}); });
# mautrix>=0.19.8,<0.20
mautrix = prev.mautrix.overridePythonAttrs (old: rec {
version = "0.19.16";
disabled = final.pythonOlder "3.8";
checkInputs = old.checkInputs ++ [ final.sqlalchemy ];
SQLALCHEMY_SILENCE_UBER_WARNING = true;
src = old.src.override {
rev = "refs/tags/v${version}";
hash = "sha256-aZlc4+J5Q+N9qEzGUMhsYguPdUy+E5I06wrjVyqvVDk=";
};
});
# mautrix has a runtime error with new ruamel-yaml since 0.17.22 changed the interface
ruamel-yaml = prev.ruamel-yaml.overridePythonAttrs (prev: rec {
version = "0.17.21";
src = prev.src.override {
version = version;
hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68=";
};
});
# SQLAlchemy>=1,<1.4 # SQLAlchemy>=1,<1.4
# SQLAlchemy 2.0's derivation is very different, so don't override, just write it from scratch # SQLAlchemy 2.0's derivation is very different, so don't override, just write it from scratch
# (see https://github.com/NixOS/nixpkgs/blob/65dbed73949e4c0207e75dcc7271b29f9e457670/pkgs/development/python-modules/sqlalchemy/default.nix) # (see https://github.com/NixOS/nixpkgs/blob/65dbed73949e4c0207e75dcc7271b29f9e457670/pkgs/development/python-modules/sqlalchemy/default.nix)
@ -60,12 +41,12 @@ let
maubot = python.pkgs.buildPythonPackage rec { maubot = python.pkgs.buildPythonPackage rec {
pname = "maubot"; pname = "maubot";
version = "0.4.1"; version = "0.4.2";
disabled = python.pythonOlder "3.8"; disabled = python.pythonOlder "3.9";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-Ro2PPgF8818F8JewPZ3AlbfWFNNHKTZkQq+1zpm3kk4="; hash = "sha256-svdg7KpCy/+T9Hu+FbsgLNU8nVuIn0flPg7qyn7I+30=";
}; };
patches = [ patches = [
@ -107,10 +88,13 @@ let
rm $out/example-config.yaml rm $out/example-config.yaml
''; '';
passthru.tests = { passthru = {
simple = runCommand "${pname}-tests" { } '' inherit python;
${maubot}/bin/mbc --help > $out tests = {
''; simple = runCommand "${pname}-tests" { } ''
${maubot}/bin/mbc --help > $out
'';
};
}; };
# Setuptools is trying to do python -m maubot test # Setuptools is trying to do python -m maubot test