nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-15 20:28:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge: mautrix-signal: 0.7.1 -> 0.7.2 and fix media uploads (#351247)

Browse Source
This commit is contained in:
Maximilian Bosch 2024-10-30 01:10:19 +01:00 committed by GitHub
commit 68a12b3d6b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 385 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

696
pkgs/by-name/li/libsignal-ffi/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

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

@ -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.57.1";
version = "0.58.3";
src = fetchFromGitHub {
fetchSubmodules = true;
owner = "signalapp";
repo = "libsignal";
rev = "v${version}";
hash = "sha256-13XhblN82lbIdv9RVjrabQfCgW1hEG1B6pp3/nQcVgY=";
hash = "sha256-21NOPLhI7xh2A8idLxWXiZLV5l8+vfHF8/DilgWTXi4=";
};
buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];

15
pkgs/servers/mautrix-signal/default.nix
View File

@ -2,6 +2,7 @@
lib,
buildGoModule,
fetchFromGitHub,
fetchpatch,
olm,
libsignal-ffi,
# This option enables the use of an experimental pure-Go implementation of
@ -14,15 +15,23 @@
buildGoModule rec {
pname = "mautrix-signal";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "mautrix";
repo = "signal";
rev = "v${version}";
hash = "sha256-OjWRdYAxjYMGZswwKqGKUwCIc5qHkNBTQgIcbiRquH0=";
hash = "sha256-KGIlLGGVaySRrHt6P2AlnDEew/ERyrDYyN2lOz3318M=";
};
patches = [
# fixes broken media uploads, will be included in the next release
(fetchpatch {
url = "https://github.com/mautrix/signal/commit/b09995a892c9930628e1669532d9c1283a4938c8.patch";
hash = "sha256-M8TvCLZG5MbD/Bkpo4cxQf/19dPfbGzMyIPn9utPLco=";
})
];
buildInputs = (lib.optional (!withGoolm) olm) ++ [
# must match the version used in https://github.com/mautrix/signal/tree/main/pkg/libsignalgo
# see https://github.com/mautrix/signal/issues/401
@ -30,7 +39,7 @@ buildGoModule rec {
];
tags = lib.optional withGoolm "goolm";
vendorHash = "sha256-oV8ILDEyMpOZy5m2mnPAZj5XAhleO8yNz49wxvZboVs=";
vendorHash = "sha256-bKQKO5RqgMrWq7NyNF1rj2CLp5SeBP80HWxF8MWnZ1U=";
doCheck = false;