Unverified Commit 1ba2b99f authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge: mautrix-signal: 0.8.1 -> 0.8.2 (#400087)

parents 04c54e94 7d643b99
Loading
Loading
Loading
Loading
+3 −3
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.67.4";
  version = "0.70.0";

  src = fetchFromGitHub {
    fetchSubmodules = true;
    owner = "signalapp";
    repo = "libsignal";
    tag = "v${version}";
    hash = "sha256-s7vTzAOWKvGCkrWcxDcKptsmxvW5VxrF5X9Vfkjj1jA=";
    hash = "sha256-6CBhLvD0UflLzJHAMB21wSH8MWTUNx0uPdqOUo/Eq44=";
  };

  buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec {
  env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";

  useFetchCargoVendor = true;
  cargoHash = "sha256-wxBbq4WtqzHbdro+tm2hU6JVwTgC2X/Cx9po+ndgECg=";
  cargoHash = "sha256-4bSPPf16nUQTl6INa3mLhPIe8iiFfpPw1E5fpNvnKqs=";

  cargoBuildFlags = [
    "-p"
+3 −3
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ let
in
buildGoModule rec {
  pname = "mautrix-signal";
  version = "0.8.1";
  version = "0.8.2";

  src = fetchFromGitHub {
    owner = "mautrix";
    repo = "signal";
    tag = "v${version}";
    hash = "sha256-w27e+gOnKsjYVSDAk8Wp7fx32igSg3sKqYyM6yUX088=";
    hash = "sha256-iCcY5PljWwkliukfMgpTgJNtnJ/xDD3Fl3JlDRgRlpk=";
  };

  buildInputs =
@@ -41,7 +41,7 @@ buildGoModule rec {

  CGO_LDFLAGS = lib.optional withGoolm [ cppStdLib ];

  vendorHash = "sha256-UXloMc9XaJe096zwdHup2DiIoXqimNjSgQRuVXbV080=";
  vendorHash = "sha256-uT2CdWETbgm0n2WAcK/FCXKIzbGGjPGO3WzoorbCidA=";

  doCheck = true;
  preCheck =