Skip to content

[release-25.05] signal-desktop.webrtc: use gn_2233 to unbreak#419048

Merged
emilylange merged 2 commits intoNixOS:release-25.05from
marcin-serwin:push-xnovpnokxxyq
Jun 22, 2025
Merged

[release-25.05] signal-desktop.webrtc: use gn_2233 to unbreak#419048
emilylange merged 2 commits intoNixOS:release-25.05from
marcin-serwin:push-xnovpnokxxyq

Conversation

@marcin-serwin
Copy link
Contributor

Alternative to #419018

fixes #418971

cc @emilylange @drupol

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@marcin-serwin marcin-serwin changed the title [25.05] Use newer gn for signal-desktop [release-25.05] Use newer gn for signal-desktop Jun 22, 2025
github-actions[bot]

This comment was marked as off-topic.

@github-actions github-actions bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 4.workflow: backport This targets a stable branch labels Jun 22, 2025
Copy link
Member

@emilylange emilylange left a comment

Choose a reason for hiding this comment

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

Can you please also extend your commit message to contain the motivation for those changes?

It does not have to be much, just something like "Init as new variant of gn because the current version is too old for signal-desktop's webrtc fork and we don't want to update gn on stable" and "to unbreak build because gn is too old".

@emilylange emilylange requested a review from teutat3s June 22, 2025 19:29
Init as new variant of gn because the current version is too old for
signal-desktop's webrtc fork and we don't want to update gn on stable.

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
Default gn on stable is too old.

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
@marcin-serwin marcin-serwin requested a review from emilylange June 22, 2025 20:12
@github-actions github-actions bot added the 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. label Jun 22, 2025
@emilylange emilylange dismissed github-actions[bot]’s stale review June 22, 2025 20:53

If you need to merge this PR despite the warnings, please dismiss this review.

@emilylange emilylange changed the title [release-25.05] Use newer gn for signal-desktop [release-25.05] signal-desktop.webrtc: use gn_2233 to unbreak Jun 22, 2025
@github-actions github-actions bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jun 22, 2025
@emilylange
Copy link
Member

# git log --oneline -n 3
7bcd08c98796 (HEAD) Merge 899cd214d943ee7fc18a0f4278da06307964bb81 into c7ab75210cb8cb16ddd8f290755d9558edde7ee1
899cd214d943 signal-desktop.webrtc: use gn_2233 to unbreak
a4a1a0c1348c gn_2233: init

# nix-build -A signal-desktop.tests --system x86_64-linux
/nix/store/kbvwdjxb9rg2vb1dyghbjzp47vpd4l39-vm-test-run-signal-desktop

# nix-build -A signal-desktop.tests --system aarch64-linux
/nix/store/gmj57jykg7bxp1n2w8ydd0f4wg06gn6m-vm-test-run-signal-desktop

@emilylange emilylange merged commit f79ffe4 into NixOS:release-25.05 Jun 22, 2025
24 of 28 checks passed
@emilylange emilylange linked an issue Jun 22, 2025 that may be closed by this pull request
3 tasks
@emilylange emilylange mentioned this pull request Jun 22, 2025
3 tasks
@marcin-serwin marcin-serwin deleted the push-xnovpnokxxyq branch June 23, 2025 16:29
justrowingby added a commit to justrowingby/dotfiles that referenced this pull request Jun 24, 2025
currently the nixos-25.05 has broken signal-desktop for a couple days
due to a nixpkgs committer merging signal version bump backport
without waiting for CI to pass. a fix was merged just 2 days later,
which was 2 days ago, but hasnt passed hydra and moved from
release-25.05 to nixos-25.05 yet.

bad merge: NixOS/nixpkgs#418529
fix merge: NixOS/nixpkgs#419048

my temp fix for this is to specify stable's exact commit in flake.nix,
to a commit shortly before the signal version bump backport. i would
like to remove the commit spec as soon as nixos-25.05 gets the right
commit to not break me.

otherwise, seemingly smooth update.
@VictorEngmarkHexagon
Copy link

Does this need porting to nixos-unstable?

@marcin-serwin
Copy link
Contributor Author

Does this need porting to nixos-unstable?

No, on nixos-unstable it already uses the newer gn thanks to #403859.

justrowingby added a commit to justrowingby/dotfiles that referenced this pull request Nov 28, 2025
currently the nixos-25.05 has broken signal-desktop for a couple days
due to a nixpkgs committer merging signal version bump backport
without waiting for CI to pass. a fix was merged just 2 days later,
which was 2 days ago, but hasnt passed hydra and moved from
release-25.05 to nixos-25.05 yet.

bad merge: NixOS/nixpkgs#418529
fix merge: NixOS/nixpkgs#419048

my temp fix for this is to specify stable's exact commit in flake.nix,
to a commit shortly before the signal version bump backport. i would
like to remove the commit spec as soon as nixos-25.05 gets the right
commit to not break me.

otherwise, seemingly smooth update.
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: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Build failure: signal-desktop

3 participants