summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSumner Evans <me@sumnerevans.com>2025-03-17 08:10:42 -0600
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2025-03-28 09:23:17 +0000
commit7eebbccf7b15e3c40da5cf9a139e6ea8498404d2 (patch)
tree8d226e73108c131419b310ecc49d99c7202234a1
parent[Backport release-24.11] vscode-utils.buildVscodeExtension: support alternati... (diff)
downloadnixpkgs-origin/backport-390682-to-release-24.11.tar.gz
mautrix-signal: 0.8.0 -> 0.8.1origin/backport-390682-to-release-24.11
https://github.com/mautrix/signal/releases/tag/v0.8.1 Also moved mautrix-signal to pkgs/by-name Signed-off-by: Sumner Evans <me@sumnerevans.com> (cherry picked from commit fb373485629648370d820cfe228416f13f522685)
-rw-r--r--pkgs/by-name/li/libsignal-ffi/package.nix6
-rw-r--r--pkgs/by-name/ma/mautrix-signal/package.nix (renamed from pkgs/servers/mautrix-signal/default.nix)6
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix
index 441622494ecd..c474a86bfdfe 100644
--- a/pkgs/by-name/li/libsignal-ffi/package.nix
+++ b/pkgs/by-name/li/libsignal-ffi/package.nix
@@ -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"
diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/by-name/ma/mautrix-signal/package.nix
index 2559b4f1f47d..86d66e59c493 100644
--- a/pkgs/servers/mautrix-signal/default.nix
+++ b/pkgs/by-name/ma/mautrix-signal/package.nix
@@ -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 =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cefc96f287eb..47cc77b11ce9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4182,8 +4182,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;