chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-11 18:32:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge: [Backport release-25.05] mautrix-signal 0.8.5 -> 0.8.6 (#437184)

Browse Source
This commit is contained in:
Maximilian Bosch
2025-08-29 15:40:51 +02:00
committed by GitHub
parent 982040c871 f7add915b0
commit eeee4532a2
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/by-name/li/libsignal-ffi/package.nix
View File

@@ -21,14 +21,14 @@ rustPlatform.buildRustPackage rec {
pname = "libsignal-ffi"; pname = "libsignal-ffi";
# must match the version used in mautrix-signal # must match the version used in mautrix-signal
# see https://github.com/mautrix/signal/issues/401 # see https://github.com/mautrix/signal/issues/401
version = "0.76.1"; version = "0.78.2";
src = fetchFromGitHub { src = fetchFromGitHub {
fetchSubmodules = true; fetchSubmodules = true;
owner = "signalapp"; owner = "signalapp";
repo = "libsignal"; repo = "libsignal";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-411+ANwyqqUX11rxCzFvPhjMWviJ0CcQlkAiqNWs32w="; hash = "sha256-4buK92sJZj5yEwFyi55WonF+1LZ5PERZ9wJZdlFjPcg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
env.BORING_BSSL_PATH = "${boringssl-wrapper}"; env.BORING_BSSL_PATH = "${boringssl-wrapper}";
env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++"; env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
cargoHash = "sha256-9W7u0fZgU0J03hT6D4BJPpIKn3dwf9yckJiwwNkyqUA="; cargoHash = "sha256-eDerNFw8jtM7qIVh3Y837Iu11yeEpAcxgFVqZJTylEc=";
cargoBuildFlags = [ cargoBuildFlags = [
"-p" "-p"
@@ -51,6 +51,9 @@ rustPlatform.buildRustPackage rec {
description = "C ABI library which exposes Signal protocol logic"; description = "C ABI library which exposes Signal protocol logic";
homepage = "https://github.com/signalapp/libsignal"; homepage = "https://github.com/signalapp/libsignal";
license = licenses.agpl3Plus; license = licenses.agpl3Plus;
maintainers = with maintainers; [ pentane ]; maintainers = with maintainers; [
pentane
SchweGELBin
];
}; };
} }

7
pkgs/by-name/ma/mautrix-signal/package.nix
View File

@@ -19,13 +19,13 @@ let
in in
buildGoModule rec { buildGoModule rec {
pname = "mautrix-signal"; pname = "mautrix-signal";
version = "0.8.5"; version = "0.8.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mautrix"; owner = "mautrix";
repo = "signal"; repo = "signal";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-koO1eeMZ8wmty6z2zyJlA7zoM6gYmFlxdF8GB2hOxb8="; hash = "sha256-62Z7Lasx0bzCAWLvHN7uCUqkMk6W80PR24mwfJU/n3Q=";
}; };
buildInputs = buildInputs =
@@ -41,7 +41,7 @@ buildGoModule rec {
CGO_LDFLAGS = lib.optional withGoolm [ cppStdLib ]; CGO_LDFLAGS = lib.optional withGoolm [ cppStdLib ];
vendorHash = "sha256-NmIWxc+6Leaqm1W+g2XdbMv4iU7Z7k8/g88U0iw/+98="; vendorHash = "sha256-srvqflqleK2KIgesEZPNhSQh/IFmyTElJ7iUjBEmNq0=";
doCheck = true; doCheck = true;
preCheck = '' preCheck = ''
@@ -68,6 +68,7 @@ buildGoModule rec {
maintainers = with maintainers; [ maintainers = with maintainers; [
pentane pentane
ma27 ma27
SchweGELBin
]; ];
mainProgram = "mautrix-signal"; mainProgram = "mautrix-signal";
}; };