Unverified Commit 68a12b3d authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge: mautrix-signal: 0.7.1 -> 0.7.2 and fix media uploads (#351247)

parents 4e9ddbc8 448684ee

pkgs/by-name/li/libsignal-ffi/Cargo.lock

+371 −325

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/li/libsignal-ffi/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -22,14 +22,14 @@ rustPlatform.buildRustPackage rec { 
  pname = "libsignal-ffi";

  # must match the version used in mautrix-signal

  # see https://github.com/mautrix/signal/issues/401

  version = "0.57.1";

  version = "0.58.3";



  src = fetchFromGitHub {

    fetchSubmodules = true;

    owner = "signalapp";

    repo = "libsignal";

    rev = "v${version}";

    hash = "sha256-13XhblN82lbIdv9RVjrabQfCgW1hEG1B6pp3/nQcVgY=";

    hash = "sha256-21NOPLhI7xh2A8idLxWXiZLV5l8+vfHF8/DilgWTXi4=";

  };



  buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];

pkgs/servers/mautrix-signal/default.nix

+12 −3
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  buildGoModule,

  fetchFromGitHub,

  fetchpatch,

  olm,

  libsignal-ffi,

  # This option enables the use of an experimental pure-Go implementation of
@@ -14,15 +15,23 @@ 


buildGoModule rec {

  pname = "mautrix-signal";

  version = "0.7.1";

  version = "0.7.2";



  src = fetchFromGitHub {

    owner = "mautrix";

    repo = "signal";

    rev = "v${version}";

    hash = "sha256-OjWRdYAxjYMGZswwKqGKUwCIc5qHkNBTQgIcbiRquH0=";

    hash = "sha256-KGIlLGGVaySRrHt6P2AlnDEew/ERyrDYyN2lOz3318M=";

  };



  patches = [

    # fixes broken media uploads, will be included in the next release

    (fetchpatch {

      url = "https://github.com/mautrix/signal/commit/b09995a892c9930628e1669532d9c1283a4938c8.patch";

      hash = "sha256-M8TvCLZG5MbD/Bkpo4cxQf/19dPfbGzMyIPn9utPLco=";

    })

  ];



  buildInputs = (lib.optional (!withGoolm) olm) ++ [

    # must match the version used in https://github.com/mautrix/signal/tree/main/pkg/libsignalgo

    # see https://github.com/mautrix/signal/issues/401
@@ -30,7 +39,7 @@ buildGoModule rec { 
  ];

  tags = lib.optional withGoolm "goolm";



  vendorHash = "sha256-oV8ILDEyMpOZy5m2mnPAZj5XAhleO8yNz49wxvZboVs=";

  vendorHash = "sha256-bKQKO5RqgMrWq7NyNF1rj2CLp5SeBP80HWxF8MWnZ1U=";



  doCheck = false;