Unverified Commit 902b5229 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #216922 from NickCao/mautrix-telegram 

mautrix-telegram: unstable-2023-01-28 -> unstable-2023-02-16, with dependency and module updates
parents 39182edc 2cf8e2f7

nixos/modules/services/matrix/mautrix-telegram.nix

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ in { 
      wantedBy = [ "multi-user.target" ];

      wants = [ "network-online.target" ] ++ cfg.serviceDependencies;

      after = [ "network-online.target" ] ++ cfg.serviceDependencies;

      path = [ pkgs.lottieconverter ];

      path = [ pkgs.lottieconverter pkgs.ffmpeg-full ];



      # mautrix-telegram tries to generate a dotfile in the home directory of

      # the running user if using a postgresql database:

pkgs/development/python-modules/mautrix/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


buildPythonPackage rec {

  pname = "mautrix";

  version = "0.19.3";

  version = "0.19.4";

  format = "setuptools";



  disabled = pythonOlder "3.8";
@@ -30,7 +30,7 @@ buildPythonPackage rec { 
    owner = "mautrix";

    repo = "python";

    rev = "v${version}";

    hash = "sha256-7nvy2/DUS2BkcyQUUG8+aT/JHcPu141e5YWOiccS6cU=";

    hash = "sha256-zPcqM+Ge7K4pJD4K0MkkGdSiYvXxe0K1qbfHzVYmGx0=";

  };



  propagatedBuildInputs = [

pkgs/servers/mautrix-telegram/default.nix

+6 −10
Original line number Diff line number Diff line
@@ -2,34 +2,33 @@ 
, python3

, fetchFromGitHub

, withE2BE ? true

, withHQthumbnails ? false

}:



let

  python = python3.override {

    packageOverrides = self: super: {

      tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec {

        version = "1.27.0a7";

        version = "1.28.0a1";

        pname = "tulir-telethon";

        src = super.fetchPypi {

          inherit pname version;

          sha256 = "sha256-w4WILvLvJBKf3Nlj0omTCDDD4z+b0XFlCplQ/IHwIPs=";

          hash = "sha256-Kf7S5nSvedhA5RYt5rbTxBiQq6DGwHJ5uEYxd9AsYIc=";

        };

        doCheck = false;

      });

    };

  };

in

python.pkgs.buildPythonPackage rec {

python.pkgs.buildPythonPackage {

  pname = "mautrix-telegram";

  version = "unstable-2023-01-28";

  version = "unstable-2023-02-16";

  disabled = python.pythonOlder "3.8";



  src = fetchFromGitHub {

    owner = "mautrix";

    repo = "telegram";

    rev = "f12abbe03846fd5897d58572ab24b70a58b337d2";

    sha256 = "sha256-5ZZ85FOmTO26q2zhAIsF7mTlN4BLNLW2dQF+0culkUM=";

    rev = "354b49d9e5f91f913b5fdf9288bc631a9a34d142";

    hash = "sha256-zdK/0jgw++YwSzP8qs1BqInQlFOoM63TeI1jF1AqDnk=";

  };



  format = "setuptools";
@@ -59,9 +58,6 @@ python.pkgs.buildPythonPackage rec { 
    prometheus-client

    # sqlite

    aiosqlite

  ] ++ lib.optionals withHQthumbnails [

    # hq_thumbnails

    moviepy

  ] ++ lib.optionals withE2BE [

    # e2be

    python-olm