Skip to content

[25.05] signal-desktop: 7.73.0 -> 7.75.1 #454870

Merged
adamcstephens merged 3 commits intoNixOS:release-25.05from
teutat3s:backport-452197-to-release-25.05
Oct 23, 2025
Merged

[25.05] signal-desktop: 7.73.0 -> 7.75.1 #454870
adamcstephens merged 3 commits intoNixOS:release-25.05from
teutat3s:backport-452197-to-release-25.05

Conversation

@teutat3s
Copy link
Member

@teutat3s teutat3s commented Oct 23, 2025

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

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

teutat3s and others added 3 commits October 23, 2025 13:31
Co-authored-by: Marcin Serwin <marcin@serwin.dev>
(cherry picked from commit 936aa39)
(cherry picked from commit 8f53ef3)
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 4.workflow: backport This targets a stable branch labels Oct 23, 2025
@nix-owners nix-owners bot requested a review from marcin-serwin October 23, 2025 12:14
@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Oct 23, 2025
@adamcstephens
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 454870
Commit: 3dc103c1ff27b5d4c3ed2bf71bf970053622e773


x86_64-linux

✅ 1 package built:
  • signal-desktop

aarch64-linux

✅ 1 package built:
  • signal-desktop

@adamcstephens adamcstephens added this pull request to the merge queue Oct 23, 2025
Merged via the queue into NixOS:release-25.05 with commit 3adb06c Oct 23, 2025
35 of 39 checks passed
@teutat3s teutat3s deleted the backport-452197-to-release-25.05 branch November 29, 2025 12:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants