From f2cd0189ec04db6227d8e5f927b6500f0e538444 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 31 Jan 2023 14:02:37 +0800 Subject: [PATCH] mautrix-googlechat: 0.4.0 -> unstable-2023-01-25 --- pkgs/servers/mautrix-googlechat/default.nix | 35 ++++++++++----------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/pkgs/servers/mautrix-googlechat/default.nix b/pkgs/servers/mautrix-googlechat/default.nix index db1f7c6d1f25..74389663455f 100644 --- a/pkgs/servers/mautrix-googlechat/default.nix +++ b/pkgs/servers/mautrix-googlechat/default.nix @@ -1,17 +1,19 @@ -{ fetchFromGitHub, fetchpatch +{ fetchFromGitHub +, fetchpatch , lib , python3 -, protobuf3_20 -, enableE2be ? true, enableMetrics ? true, enableSqlite ? true +, enableE2be ? true +, enableMetrics ? true +, enableSqlite ? true }: python3.pkgs.buildPythonApplication rec { pname = "mautrix-googlechat"; - version = "0.4.0"; + version = "unstable-2023-01-25"; src = fetchFromGitHub { owner = "mautrix"; repo = "googlechat"; - rev = "v${version}"; - sha256 = "sha256-UVWYT0HTOUEkBG0n6KNhCSSO/2PAF1rIvCaw478z+q0="; + rev = "e2eb528745466468f059c506c22e500e0cd832aa"; + sha256 = "sha256-FNlEHzuy89RuFUwZPmVA+4AmpQHGD+18BguGC6qBdBM="; }; patches = [ @@ -24,13 +26,6 @@ }) ]; - doCheck = false; - - postPatch = '' - sed -i requirements.txt \ - -e 's/asyncpg>=.*/asyncpg/' - ''; - baseConfigPath = "share/mautrix-googlechat/example-config.yaml"; postInstall = '' rm $out/example-config.yaml @@ -43,8 +38,12 @@ pycryptodome unpaddedbase64 ]; - metrics = [ prometheus-client ]; - sqlite = [ aiosqlite ]; + metrics = [ + prometheus-client + ]; + sqlite = [ + aiosqlite + ]; }; propagatedBuildInputs = with python3.pkgs; [ @@ -54,14 +53,14 @@ ruamel-yaml CommonMark python-magic - (protobuf.override { - protobuf = protobuf3_20; - }) + protobuf3 mautrix ] ++ lib.optionals enableE2be passthru.optional-dependencies.e2be ++ lib.optionals enableMetrics passthru.optional-dependencies.metrics ++ lib.optionals enableSqlite passthru.optional-dependencies.sqlite; + doCheck = false; + meta = with lib; { homepage = "https://github.com/mautrix/googlechat"; description = "A Matrix-Google Chat puppeting bridge";