Skip to content

[bypass staging-next] Merge pull request #157631 from ivanbrennan/re-add-alsa-lib-patch#158949

Closed
Synthetica9 wants to merge 1 commit intoNixOS:masterfrom
Synthetica9:alsa-fix-master
Closed

[bypass staging-next] Merge pull request #157631 from ivanbrennan/re-add-alsa-lib-patch#158949
Synthetica9 wants to merge 1 commit intoNixOS:masterfrom
Synthetica9:alsa-fix-master

Conversation

@Synthetica9
Copy link
Member

@Synthetica9 Synthetica9 commented Feb 10, 2022 •
edited
Loading

Motivation for this change

A lot of people's audio is (partially) broken at the moment, and the fix for this is already in staging-next. This is a cherry-pick of that merge. I think this has high enough priority that a staging bypass is warranted.

See also:

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.05 Release Notes (or backporting 21.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@Synthetica9 Synthetica9 mentioned this pull request Feb 10, 2022
Merged
@Synthetica9
Copy link
Member Author

Synthetica9 commented Feb 10, 2022

@ofborg test pulseaudio.user

@zowoq zowoq requested review from jonringer and vcunat February 10, 2022 11:41
@vcunat
Copy link
Member

vcunat commented Feb 10, 2022 •
edited
Loading

Previous check shows over 17k rebuilds. We might as well merge staging-next as that's not much higher anymore. EDIT: unless some more significant regression remains in there.

@ofborg ofborg bot requested a review from L-as February 10, 2022 11:51
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 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. labels Feb 10, 2022
@Synthetica9
Copy link
Member Author

Synthetica9 commented Feb 10, 2022

Previous check shows over 17k rebuilds. We might as well merge staging-next as that's not much higher anymore. EDIT: unless some more significant regression remains in there.

I'm just worried that things are gonna stay broken while staging-next is figured out.

@zowoq
Copy link
Contributor

zowoq commented Feb 10, 2022

I'm just worried that things are gonna stay broken while staging-next is figured out.

There are security fixes in staging-next that I'd prioritize over partially broken audio.

We might as well merge staging-next as that's not much higher anymore.

Can we throttle darwin builds on staging-next-21.11 to speed up staging-next a bit?

@vcunat
Copy link
Member

vcunat commented Feb 10, 2022

staging-next-21.11 had very low build shares for this iteration, from the very start.

@L-as
Copy link
Member

L-as commented Feb 10, 2022 via email

@nova-nowiz
Copy link
Contributor

nova-nowiz commented Feb 10, 2022 •
edited
Loading

In any case you can also fix the NixOS module that makes use of this misfeature. libs.native is not an ALSA config and we should not patch ALSA to add it.

Do you know more precisely where the problem is, or would it be possible for you to make a PR @L-as?

@nova-nowiz
Copy link
Contributor

nova-nowiz commented Feb 10, 2022

I've just seen that #157352 was actually doing what you are asking for @L-as but was dropped in favor of this PR for deprecating the 32 bits options instead of silently removing them.

@jonringer
Copy link
Contributor

jonringer commented Feb 10, 2022

I'm in favor of merging to staging-next, then just merging staging-next

@vcunat
Copy link
Member

vcunat commented Feb 10, 2022

It is already there as 3b139b9. This PR is an attempt to go even faster.

@jonringer
Copy link
Contributor

jonringer commented Feb 10, 2022

#158080 has beem merged.

All platforms but x86_64-darwin were in double digit rebuild counts.

@zowoq
Copy link
Contributor

zowoq commented Feb 13, 2022

I really need to figure out why matrix won't let me sign in so I'm not asking semi-unrelated questions on PRs but until then:

Are we missing x86_64 darwin builders? Seems even slower than usual and https://hydra.nixos.org/machines doesn't seem to list as many as I thought we had?

@vcunat
Copy link
Member

vcunat commented Feb 14, 2022

Yes, that's a temporary state. (though I don't know any estimate)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vcunat vcunat Awaiting requested review from vcunat

@jonringer jonringer Awaiting requested review from jonringer

@L-as L-as Awaiting requested review from L-as

Assignees

No one assigned

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@Synthetica9 @vcunat @zowoq @L-as @nova-nowiz @jonringer