From 2f1631a6039792ee215084b89a9a0d7f55c62009 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Fri, 3 Sep 2021 12:28:48 -0400 Subject: [PATCH 1/2] mautrix-facebook: init at 0.3.1 --- pkgs/servers/mautrix-facebook/default.nix | 57 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/servers/mautrix-facebook/default.nix diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix new file mode 100644 index 000000000000..901041578c2f --- /dev/null +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -0,0 +1,57 @@ +{ fetchFromGitHub +, lib +, python3 +, stdenv +}: + +python3.pkgs.buildPythonPackage rec { + pname = "mautrix-facebook"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "mautrix"; + repo = "facebook"; + rev = "v${version}"; + sha256 = "0m7nznx3z6cg4wgvjybdivx22ifxcdri4i8501yibsri0jnpf0y2"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + CommonMark + aiohttp + asyncpg + mautrix + paho-mqtt + pillow + prometheus-client + pycryptodome + python-olm + python_magic + ruamel_yaml + unpaddedbase64 + yarl + ]; + + doCheck = false; + + postPatch = '' + sed -ie 's/^asyncpg.*/asyncpg>=0.20/' requirements.txt + ''; + + postInstall = '' + mkdir -p $out/bin + + cat <<-END >$out/bin/mautrix-facebook + #!/bin/sh + PYTHONPATH="$PYTHONPATH" exec ${python3}/bin/python -m mautrix_facebook "\$@" + END + chmod +x $out/bin/mautrix-facebook + ''; + + meta = with lib; { + homepage = "https://github.com/mautrix/facebook"; + description = "A Matrix-Facebook Messenger puppeting bridge"; + license = licenses.agpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ kevincox ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12d312b657a1..8221471f7621 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6624,6 +6624,8 @@ with pkgs; matrix-corporal = callPackage ../servers/matrix-corporal { }; + mautrix-facebook = callPackage ../servers/mautrix-facebook { }; + mautrix-signal = recurseIntoAttrs (callPackage ../servers/mautrix-signal { }); mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { }); From 33bbe582996d4941ef059e82be628abfcc32e7c6 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Sun, 5 Sep 2021 07:09:46 -0400 Subject: [PATCH 2/2] mautrix-facebook: Support journald logging. --- pkgs/servers/mautrix-facebook/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix index 901041578c2f..b9e86f01fbdb 100644 --- a/pkgs/servers/mautrix-facebook/default.nix +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -1,4 +1,5 @@ -{ fetchFromGitHub +{ enableSystemd ? stdenv.isLinux +, fetchFromGitHub , lib , python3 , stdenv @@ -29,7 +30,7 @@ python3.pkgs.buildPythonPackage rec { ruamel_yaml unpaddedbase64 yarl - ]; + ] ++ lib.optional enableSystemd systemd; doCheck = false;