Unverified Commit 446e809d authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge: mautrix-signal: 0.8.0 -> 0.8.1 (#390682)

parents ca1dc4ea fb373485
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.66.2";
  version = "0.67.4";

  src = fetchFromGitHub {
    fetchSubmodules = true;
    owner = "signalapp";
    repo = "libsignal";
    tag = "v${version}";
    hash = "sha256-V7w+77X1a2Uga/RUCqppY3THbAktaPN+DLrze4UwfHM=";
    hash = "sha256-s7vTzAOWKvGCkrWcxDcKptsmxvW5VxrF5X9Vfkjj1jA=";
  };

  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-a3Xb37gFs7GWk8/9cFdaC9tsYCv/MQGJ78r5YCQ0DOo=";
  cargoHash = "sha256-wxBbq4WtqzHbdro+tm2hU6JVwTgC2X/Cx9po+ndgECg=";

  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.0";
  version = "0.8.1";

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

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

  CGO_LDFLAGS = lib.optional withGoolm [ cppStdLib ];

  vendorHash = "sha256-nulCcnnQD3cgk4ntWeUwY/+izTxhJCLV0XJRx1h8emY=";
  vendorHash = "sha256-UXloMc9XaJe096zwdHup2DiIoXqimNjSgQRuVXbV080=";

  doCheck = true;
  preCheck =
+0 −2
Original line number Diff line number Diff line
@@ -3815,8 +3815,6 @@ with pkgs;
  maubot = with python3Packages; toPythonApplication maubot;
  mautrix-signal = recurseIntoAttrs (callPackage ../servers/mautrix-signal { });
  mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { });
  m2r = with python3Packages; toPythonApplication m2r;