[25.05] signal-desktop: 7.73.0 -> 7.75.1 #454870
[25.05] signal-desktop: 7.73.0 -> 7.75.1 #454870adamcstephens merged 3 commits intoNixOS:release-25.05from
Conversation
Co-authored-by: Marcin Serwin <marcin@serwin.dev> (cherry picked from commit 936aa39)
(cherry picked from commit 8f53ef3)
Changelog: https://github.com/signalapp/Signal-Desktop/releases/tag/v7.75.1 (cherry picked from commit cdeec81)
There was a problem hiding this comment.
This report is automatically generated by the PR / Check / cherry-pick CI workflow.
Some of the commits in this PR require the author's and reviewer's attention.
Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.
If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.
Warning
Difference between f97da01 and original 936aa39 may warrant inspection.
Show diff
@@ Commit message
signal-desktop: 7.73.0 -> 7.74.0
Co-authored-by: Marcin Serwin <marcin@serwin.dev>
+ (cherry picked from commit 936aa39307a68f70b824d4807736986139767451)
## pkgs/by-name/si/signal-desktop/package.nix ##
@@ pkgs/by-name/si/signal-desktop/package.nix: let
@@ pkgs/by-name/si/signal-desktop/package.nix: stdenv.mkDerivation (finalAttrs: {
makeWrapper '${lib.getExe electron}' "$out/bin/signal-desktop" \
--add-flags "$out/share/signal-desktop/app.asar" \
--set-default ELECTRON_FORCE_IS_PACKAGED 1 \
-- --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
-+ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
- --add-flags ${lib.escapeShellArg commandLineArgs}
+- --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
++ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
runHook postInstall
+ '';
## pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch ##
@@ pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch: diff --git a/package.json b/package.json
@@ pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch: index
## pkgs/by-name/si/signal-desktop/ringrtc.nix ##
@@ pkgs/by-name/si/signal-desktop/ringrtc.nix: let
in
- rustPlatform.buildRustPackage (finalAttrs: {
+ rustPackages_1_89.rustPlatform.buildRustPackage (finalAttrs: {
pname = "ringrtc";
- version = "2.58.1";
+ version = "2.59.0";
@@ pkgs/by-name/si/signal-desktop/webrtc-sources.json
"fetcher": "fetchFromGitiles"
## pkgs/by-name/si/signal-desktop/webrtc.nix ##
-@@ pkgs/by-name/si/signal-desktop/webrtc.nix: let
- in
+@@
+
stdenv.mkDerivation (finalAttrs: {
pname = "signal-webrtc";
- version = finalAttrs.gclientDeps."src".path.rev;
Hint: The full diffs are also available in the runner logs with slightly better highlighting.
|
manually remediated
3adb06c
Manual backport of #452197. Fixed a merge conflict caused by #404989, which wasn't backported to 25.05.
Builds, starts and works fine on
x86_64-linux.Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Add a 👍 reaction to pull requests you find important.