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

Merge: mautrix-signal: 0.7.5 -> 0.8.0 (#382616)

parents 97a86007 31924d36

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

deleted100644 → 0
+0 −5425

File deleted.

Preview size limit exceeded, changes collapsed.

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

+6 −13
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.64.1";

  version = "0.66.2";



  src = fetchFromGitHub {

    fetchSubmodules = true;

    owner = "signalapp";

    repo = "libsignal";

    rev = "v${version}";

    hash = "sha256-36z8Tgf3w0ZDLOS7hMTeVbZLiq/M/es6+sL8rEWtps4=";

    tag = "v${version}";

    hash = "sha256-V7w+77X1a2Uga/RUCqppY3THbAktaPN+DLrze4UwfHM=";

  };



  buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
@@ -40,17 +40,10 @@ rustPlatform.buildRustPackage rec { 
  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ];



  env.BORING_BSSL_PATH = "${boringssl-wrapper}";

  env.NIX_LDFLAGS = "-lstdc++";

  env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";



  # The Cargo.lock contains git dependencies

  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "boring-4.13.0" = "sha256-+0LeCN4YtHe84GzkMZog8gCTvrzVNoAYXv04jQXZaUo=";

      "intmap-2.0.0" = "sha256-PGlkaZl+DYS4QkpJFfUf+2unVKwd9vLNF0N+/YFg8qE=";

      "curve25519-dalek-4.1.3" = "sha256-bPh7eEgcZnq9C3wmSnnYv0C4aAP+7pnwk9Io29GrI4A=";

    };

  };

  useFetchCargoVendor = true;

  cargoHash = "sha256-a3Xb37gFs7GWk8/9cFdaC9tsYCv/MQGJ78r5YCQ0DOo=";



  cargoBuildFlags = [

    "-p"

pkgs/servers/mautrix-signal/default.nix

+9 −6
Original line number Diff line number Diff line
@@ -14,15 +14,18 @@ 
  withGoolm ? false,

}:



let

  cppStdLib = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";

in

buildGoModule rec {

  pname = "mautrix-signal";

  version = "0.7.5";

  version = "0.8.0";



  src = fetchFromGitHub {

    owner = "mautrix";

    repo = "signal";

    rev = "v${version}";

    hash = "sha256-iBZoVfHec9g+W7xaBAAew/aY9h/errwLdC05biFaZ78=";

    tag = "v${version}";

    hash = "sha256-/x71et9lqx8VTOz6G4R5Rz54vjZT7CzXy72m9Mc6pUI=";

  };



  buildInputs =
@@ -36,9 +39,9 @@ buildGoModule rec { 


  tags = lib.optional withGoolm "goolm";



  CGO_LDFLAGS = lib.optional withGoolm [ "-lstdc++" ];

  CGO_LDFLAGS = lib.optional withGoolm [ cppStdLib ];



  vendorHash = "sha256-RKBewWc98+WpdpXF4QA/ULyZXDR0CKym8KdyeSMd0KA=";

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



  doCheck = true;

  preCheck =
@@ -48,7 +51,7 @@ buildGoModule rec { 
    ''

    + (lib.optionalString (!withGoolm) ''

      # When using libolm, the tests need explicit linking to libstdc++

      export CGO_LDFLAGS="-lstdc++"

      export CGO_LDFLAGS="${cppStdLib}"

    '');



  postCheck = ''