mirror of
https://github.com/CHN-beta/nixpkgs.git
synced 2026-01-11 18:32:23 +08:00
Merge: [Backport release-25.05] mautrix-signal 0.8.5 -> 0.8.6 (#437184)
This commit is contained in:
@@ -21,14 +21,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.76.1";
|
||||
version = "0.78.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
fetchSubmodules = true;
|
||||
owner = "signalapp";
|
||||
repo = "libsignal";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-411+ANwyqqUX11rxCzFvPhjMWviJ0CcQlkAiqNWs32w=";
|
||||
hash = "sha256-4buK92sJZj5yEwFyi55WonF+1LZ5PERZ9wJZdlFjPcg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
|
||||
env.BORING_BSSL_PATH = "${boringssl-wrapper}";
|
||||
env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
|
||||
|
||||
cargoHash = "sha256-9W7u0fZgU0J03hT6D4BJPpIKn3dwf9yckJiwwNkyqUA=";
|
||||
cargoHash = "sha256-eDerNFw8jtM7qIVh3Y837Iu11yeEpAcxgFVqZJTylEc=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
@@ -51,6 +51,9 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "C ABI library which exposes Signal protocol logic";
|
||||
homepage = "https://github.com/signalapp/libsignal";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ pentane ];
|
||||
maintainers = with maintainers; [
|
||||
pentane
|
||||
SchweGELBin
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -19,13 +19,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-signal";
|
||||
version = "0.8.5";
|
||||
version = "0.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "signal";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-koO1eeMZ8wmty6z2zyJlA7zoM6gYmFlxdF8GB2hOxb8=";
|
||||
hash = "sha256-62Z7Lasx0bzCAWLvHN7uCUqkMk6W80PR24mwfJU/n3Q=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
@@ -41,7 +41,7 @@ buildGoModule rec {
|
||||
|
||||
CGO_LDFLAGS = lib.optional withGoolm [ cppStdLib ];
|
||||
|
||||
vendorHash = "sha256-NmIWxc+6Leaqm1W+g2XdbMv4iU7Z7k8/g88U0iw/+98=";
|
||||
vendorHash = "sha256-srvqflqleK2KIgesEZPNhSQh/IFmyTElJ7iUjBEmNq0=";
|
||||
|
||||
doCheck = true;
|
||||
preCheck = ''
|
||||
@@ -68,6 +68,7 @@ buildGoModule rec {
|
||||
maintainers = with maintainers; [
|
||||
pentane
|
||||
ma27
|
||||
SchweGELBin
|
||||
];
|
||||
mainProgram = "mautrix-signal";
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user