gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge: mautrix-signal: 0.7.3 -> 0.7.4 (#367446)

Browse Source
This commit is contained in:
Maximilian Bosch
2024-12-29 16:57:15 +01:00
committed by GitHub
parent 6df40c4821 70952477bf
commit 5a9fe1fa7d
3 changed files with 77 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/li/libsignal-ffi/Cargo.lock
Generated
+69 -10
View File
@@ -421,20 +421,21 @@ dependencies = [
[[package]]
name = "boring"
version = "4.9.0"
source = "git+https://github.com/signalapp/boring?tag=signal-v4.9.0b#3d4180b232d332a86ee3b41d1a622b0f1c1c6037"
version = "4.13.0"
source = "git+https://github.com/signalapp/boring?tag=signal-v4.13.0#1af143f50937bce6a9a9c7405ec824a9153c8ba0"
dependencies = [
"bitflags",
"boring-sys",
"foreign-types",
"libc",
"once_cell",
"openssl-macros",
]
[[package]]
name = "boring-sys"
version = "4.9.0"
source = "git+https://github.com/signalapp/boring?tag=signal-v4.9.0b#3d4180b232d332a86ee3b41d1a622b0f1c1c6037"
version = "4.13.0"
source = "git+https://github.com/signalapp/boring?tag=signal-v4.13.0#1af143f50937bce6a9a9c7405ec824a9153c8ba0"
dependencies = [
"autocfg",
"bindgen",
@@ -1244,6 +1245,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
dependencies = [
"crc32fast",
"libz-sys",
"miniz_oxide",
]
@@ -1837,6 +1839,11 @@ dependencies = [
"generic-array",
]
[[package]]
name = "intmap"
version = "2.0.0"
source = "git+https://github.com/JesperAxelsson/rust-intmap?rev=e7edd6e8fb452506ca2570e91f62b14dc29a950c#e7edd6e8fb452506ca2570e91f62b14dc29a950c"
[[package]]
name = "ipnet"
version = "2.10.0"
@@ -2185,7 +2192,7 @@ dependencies = [
[[package]]
name = "libsignal-ffi"
version = "0.62.0"
version = "0.64.1"
dependencies = [
"cpufeatures",
"futures-util",
@@ -2200,10 +2207,11 @@ dependencies = [
[[package]]
name = "libsignal-jni"
version = "0.62.0"
version = "0.64.1"
dependencies = [
"cfg-if",
"cpufeatures",
"flate2",
"jni 0.19.0",
"jni 0.21.1",
"libsignal-bridge",
@@ -2216,7 +2224,7 @@ dependencies = [
[[package]]
name = "libsignal-jni-testing"
version = "0.62.0"
version = "0.64.1"
dependencies = [
"jni 0.21.1",
"libsignal-bridge-testing",
@@ -2258,15 +2266,18 @@ dependencies = [
"cbc",
"clap",
"clap-stdin",
"criterion",
"derive-where",
"dir-test",
"displaydoc",
"env_logger",
"flate2",
"futures",
"hex",
"hex-literal",
"hkdf",
"hmac",
"intmap",
"itertools 0.13.0",
"json5",
"libsignal-account-keys",
@@ -2284,6 +2295,7 @@ dependencies = [
"protobuf",
"protobuf-codegen",
"protobuf-json-mapping",
"rand",
"serde",
"serde_json",
"sha2",
@@ -2296,6 +2308,7 @@ dependencies = [
"thiserror",
"usernames",
"uuid",
"visibility",
"zkcredential",
"zkgroup",
]
@@ -2422,12 +2435,13 @@ dependencies = [
"tokio-util",
"tungstenite 0.23.0",
"url",
"visibility",
"warp",
]
[[package]]
name = "libsignal-node"
version = "0.62.0"
version = "0.64.1"
dependencies = [
"cmake",
"futures",
@@ -2510,6 +2524,17 @@ dependencies = [
"zerocopy",
]
[[package]]
name = "libz-sys"
version = "1.1.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472"
dependencies = [
"cc",
"pkg-config",
"vcpkg",
]
[[package]]
name = "linkme"
version = "0.3.28"
@@ -2948,6 +2973,17 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
[[package]]
name = "openssl-macros"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.77",
]
[[package]]
name = "openssl-probe"
version = "0.1.5"
@@ -3148,6 +3184,12 @@ dependencies = [
"spki",
]
[[package]]
name = "pkg-config"
version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
[[package]]
name = "plotters"
version = "0.3.7"
@@ -4457,8 +4499,8 @@ dependencies = [
[[package]]
name = "tokio-boring"
version = "4.9.0"
source = "git+https://github.com/signalapp/boring?tag=signal-v4.9.0b#3d4180b232d332a86ee3b41d1a622b0f1c1c6037"
version = "4.13.0"
source = "git+https://github.com/signalapp/boring?tag=signal-v4.13.0#1af143f50937bce6a9a9c7405ec824a9153c8ba0"
dependencies = [
"boring",
"boring-sys",
@@ -4803,12 +4845,29 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
[[package]]
name = "vcpkg"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
[[package]]
name = "version_check"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
name = "visibility"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.77",
]
[[package]]
name = "wait-timeout"
version = "0.2.0"
pkgs/by-name/li/libsignal-ffi/package.nix
+5 -3
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.62.0";
version = "0.64.1";
src = fetchFromGitHub {
fetchSubmodules = true;
owner = "signalapp";
repo = "libsignal";
rev = "v${version}";
hash = "sha256-+tY00a5NJflVkSVESFhaP1B5qqZs72AwZM9pCIrAQRk=";
hash = "sha256-36z8Tgf3w0ZDLOS7hMTeVbZLiq/M/es6+sL8rEWtps4=";
};
buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
@@ -40,12 +40,14 @@ rustPlatform.buildRustPackage rec {
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ];
env.BORING_BSSL_PATH = "${boringssl-wrapper}";
env.NIX_LDFLAGS = "-lstdc++";
# The Cargo.lock contains git dependencies
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"boring-4.9.0" = "sha256-zhf0sO6TV4e55k4MxAB/TlXdqd96dg6i674RbuUPrtM=";
"boring-4.13.0" = "sha256-+0LeCN4YtHe84GzkMZog8gCTvrzVNoAYXv04jQXZaUo=";
"intmap-2.0.0" = "sha256-PGlkaZl+DYS4QkpJFfUf+2unVKwd9vLNF0N+/YFg8qE=";
"curve25519-dalek-4.1.3" = "sha256-bPh7eEgcZnq9C3wmSnnYv0C4aAP+7pnwk9Io29GrI4A=";
};
};
pkgs/servers/mautrix-signal/default.nix
+3 -3
View File
@@ -16,13 +16,13 @@
buildGoModule rec {
pname = "mautrix-signal";
version = "0.7.3";
version = "0.7.4";
src = fetchFromGitHub {
owner = "mautrix";
repo = "signal";
rev = "v${version}";
hash = "sha256-VU0VZkh1sjOuSI+/JXZKWQF5pZ3NebBFbDdsOgaocg4=";
hash = "sha256-1UI2oYDnmwy9+URBMA2yTBMEoFsE8qnkhn7E0l/lOTs=";
};
buildInputs =
@@ -38,7 +38,7 @@ buildGoModule rec {
CGO_LDFLAGS = lib.optional withGoolm [ "-lstdc++" ];
vendorHash = "sha256-fERAigormEy6+240AOkMyrjMDj5/eU0Lo4wD0AuAn+4=";
vendorHash = "sha256-ADuW6KMNUwJeGqFlQsJ8qSI0alPQpSAFx1zrhwsAmsI=";
doCheck = true;
preCheck =