Skip to content

webrtc-audio-processing: 0.3 → 2.1#402787

Merged
wegank merged 8 commits intoNixOS:stagingfrom
FZDSLR:webrtc-audio-processing-v2
Jun 28, 2025
Merged

webrtc-audio-processing: 0.3 → 2.1#402787
wegank merged 8 commits intoNixOS:stagingfrom
FZDSLR:webrtc-audio-processing-v2

Conversation

@FZDSLR
Copy link
Copy Markdown
Contributor

@FZDSLR FZDSLR commented Apr 29, 2025

Follow the upstream update.

Things done

  • Move the original default.nix ( v1.3 ) to pkgs/by-name/we/webrtc-audio-processing_1
  • Move v0.3 to pkgs/by-name/we/webrtc-audio-processing_0_3
  • Put the newest ( v2.1 ) in pkgs/by-name/we/webrtc-audio-processing
  • Update dino and pipewire 's webrtc-audio-processing to the newest.

Notes for the old versions:

  • Now only jami uses v0.3
  • pulseaudio and gst_all_1.gst-plugins-bad uses v1

The old versions can be removed after the upstream supports the newer webrtc-audio-processing.

  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (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.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions Bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 29, 2025
Comment thread pkgs/development/libraries/webrtc-audio-processing/1.3.nix Outdated
Comment thread pkgs/top-level/all-packages.nix Outdated
@FZDSLR FZDSLR marked this pull request as draft April 29, 2025 12:09
@FZDSLR FZDSLR force-pushed the webrtc-audio-processing-v2 branch from 966a16b to fd99520 Compare April 29, 2025 12:22
Comment thread pkgs/by-name/we/webrtc-audio-processing_2/package.nix Outdated
Copy link
Copy Markdown
Contributor

@yzx9 yzx9 left a comment

Choose a reason for hiding this comment

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

You may want to move webrtc-audio-processing/default.nix to pkgs/by-name/we/webrtc-audio-processing/package.nix,
and move 0.3.nix accordingly. Then, add a new 2.nix and update the corresponding entries in pkgs/top-level/all-packages.nix. #401089 could serve as an example.

For the merger: I’m not entirely sure why:

  • webrtc-audio-processing (in 0.3.nix) points to v0.3.1,
  • and webrtc-audio-processing_1 (in default.nix) points to v1.3.

Also, since there don’t seem to be any downstream packages. Should we rename them like this?

  • webrtc-audio-processing (in package.nix), pointing to v2.1
  • webrtc-audio-processing_1 (in 1.nix), pointing to v1.3
  • webrtc-audio-processing_0_3 (in 0.3.nix), pointing to v0.3.1

Comment thread pkgs/by-name/we/webrtc-audio-processing_2/package.nix Outdated
Comment thread pkgs/by-name/we/webrtc-audio-processing_2/package.nix Outdated
Comment thread pkgs/by-name/we/webrtc-audio-processing_2/package.nix Outdated
@Aleksanaa Aleksanaa added 6.topic: loongarch64 LoongArch, a new RISC ISA used on Loongson CPUs and removed 6.topic: loongarch64 LoongArch, a new RISC ISA used on Loongson CPUs labels Apr 29, 2025
@FZDSLR
Copy link
Copy Markdown
Contributor Author

FZDSLR commented Apr 29, 2025

You may want to move webrtc-audio-processing/default.nix to pkgs/by-name/we/webrtc-audio-processing/package.nix, and move 0.3.nix accordingly. Then, add a new 2.nix and update the corresponding entries in pkgs/top-level/all-packages.nix. #401089 could serve as an example.

OK, I think this is a good way to solve it. I'll try on it.

For the merger: I’m not entirely sure why:

  • webrtc-audio-processing (in 0.3.nix) points to v0.3.1,
  • and webrtc-audio-processing_1 (in default.nix) points to v1.3.

Also, since there don’t seem to be any downstream packages. Should we rename them like this?

  • webrtc-audio-processing (in package.nix), pointing to v2.1
  • webrtc-audio-processing_1 (in 1.nix), pointing to v1.3
  • webrtc-audio-processing_0_3 (in 0.3.nix), pointing to v0.3.1

I'm also feel puzzled about it. It seems that there is no compatibility between different major versions of webrtc-audio-processing . If we change the "default" version to v2.1, then change the input of the packages who have this package as a dependency ( like this one) is needed.

Comment thread pkgs/by-name/we/webrtc-audio-processing_2/package.nix Outdated
@wegank
Copy link
Copy Markdown
Member

wegank commented Apr 29, 2025

In the meantime, if one of your goals is to fix webrtc-audio-processing_{0_3,1} on loongarch64-linux, you can check if patches from the following commits apply (although PRs may need to target staging):

@FZDSLR FZDSLR force-pushed the webrtc-audio-processing-v2 branch from fd99520 to 06328a7 Compare April 29, 2025 16:32
@github-actions github-actions Bot removed the 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. label Apr 29, 2025
@FZDSLR
Copy link
Copy Markdown
Contributor Author

FZDSLR commented Apr 29, 2025

This commit changes the "default" version from 0.3.1 to 2.1. Plan to change downstream packages inputs in the following commits.

Comment thread pkgs/by-name/we/webrtc-audio-processing/package.nix Outdated
@github-actions github-actions Bot added 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` labels Apr 30, 2025
@FZDSLR FZDSLR changed the title webrtc-audio-processing_2: init 2.1 webrtc-audio-processing: 1.3 → 2.1 Apr 30, 2025
@FZDSLR FZDSLR marked this pull request as ready for review April 30, 2025 03:03
@FZDSLR
Copy link
Copy Markdown
Contributor Author

FZDSLR commented Apr 30, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 402787


x86_64-linux

✅ 2 packages built:
  • webrtc-audio-processing
  • webrtc-audio-processing.dev

Copy link
Copy Markdown
Contributor

@RossSmyth RossSmyth left a comment

Choose a reason for hiding this comment

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

Looks good beyond the formatting CI failure.

Comment thread pkgs/by-name/we/webrtc-audio-processing/package.nix Outdated
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Apr 30, 2025
Copy link
Copy Markdown
Contributor

@RossSmyth RossSmyth left a comment

Choose a reason for hiding this comment

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

Looks good, thanks!

@RossSmyth
Copy link
Copy Markdown
Contributor

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 402787

Logs: https://github.com/RossSmyth/nixpkgs-review-gha/actions/runs/14780535045


x86_64-linux (sandbox = true)

✅ 2 packages built:
  • webrtc-audio-processing
  • webrtc-audio-processing.dev

aarch64-linux (sandbox = true)

✅ 2 packages built:
  • webrtc-audio-processing
  • webrtc-audio-processing.dev

x86_64-darwin (sandbox = true)

✅ 2 packages built:
  • webrtc-audio-processing
  • webrtc-audio-processing.dev

aarch64-darwin (sandbox = true)

✅ 2 packages built:
  • webrtc-audio-processing
  • webrtc-audio-processing.dev

@FZDSLR FZDSLR requested a review from yzx9 May 2, 2025 10:13
@FZDSLR FZDSLR force-pushed the webrtc-audio-processing-v2 branch from 25cf5e4 to f90c75a Compare May 9, 2025 15:41
@github-actions github-actions Bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. and removed 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. labels May 9, 2025
@FZDSLR FZDSLR force-pushed the webrtc-audio-processing-v2 branch from a914686 to 57931d0 Compare May 10, 2025 02:51
@github-actions github-actions Bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. and removed 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. labels May 10, 2025
@FZDSLR FZDSLR force-pushed the webrtc-audio-processing-v2 branch from 57931d0 to 8f1b9ba Compare May 10, 2025 03:57
@FZDSLR
Copy link
Copy Markdown
Contributor Author

FZDSLR commented May 10, 2025

We may need to contain webrtc_audio_processing_1 becasue pulseaudio depends on it. See here.

@K900
Copy link
Copy Markdown
Contributor

K900 commented May 10, 2025

Does Pulse not build with 2.1?

@FZDSLR
Copy link
Copy Markdown
Contributor Author

FZDSLR commented May 10, 2025

Does Pulse not build with 2.1?

Yes. For details, see https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/blob/v17.0/meson.build?ref_type=tags#L730-733

@K900
Copy link
Copy Markdown
Contributor

K900 commented May 10, 2025

And it's the only user of v1 left in tree?

@FZDSLR
Copy link
Copy Markdown
Contributor Author

FZDSLR commented May 10, 2025

And it's the only user of v1 left in tree?

gst_all_1.gst-plugins-bad also use v1. But I haven't make sure whether it has a patch to use v2 or not.

git grep "webrtc-audio-processing_1"
pkgs/development/libraries/gstreamer/bad/default.nix:  webrtc-audio-processing_1,
pkgs/development/libraries/gstreamer/bad/default.nix:      webrtc-audio-processing_1
pkgs/servers/pulseaudio/default.nix:  webrtc-audio-processing_1,
pkgs/servers/pulseaudio/default.nix:        webrtc-audio-processing_1

@K900
Copy link
Copy Markdown
Contributor

K900 commented May 10, 2025

Then I guess we can keep it for now.

@FZDSLR FZDSLR marked this pull request as ready for review May 10, 2025 13:35
@FZDSLR FZDSLR requested a review from alyssais May 10, 2025 13:36
@alyssais alyssais dismissed their stale review May 10, 2025 15:06

Platforms are fixed and that's all I care about here :)

@wegank wegank force-pushed the webrtc-audio-processing-v2 branch from 8f1b9ba to aecafce Compare June 25, 2025 23:26
@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. and removed 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Jun 25, 2025
Copy link
Copy Markdown
Member

@wegank wegank left a comment

Choose a reason for hiding this comment

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

Built up to the graphical ISO with the PR applied on master.

@wegank wegank merged commit 493c093 into NixOS:staging Jun 28, 2025
27 of 28 checks passed
@FZDSLR FZDSLR deleted the webrtc-audio-processing-v2 branch July 1, 2025 08:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants