Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixos: hardware.pulseaudio → services.pulseaudio #369391

Merged
merged 1 commit into from
Dec 30, 2024

Conversation

nbraud
Copy link
Contributor

@nbraud nbraud commented Dec 30, 2024

Rename the hardware.pulseaudio options to services.pulseaudio.

This is more consistent, considering:

  • pulseaudio can be used without local audio hardware, nor is it necessary to use said hardware ;
  • jack and pipewire are under services.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
  • Tested, as applicable:
    • nixosTests.pulseaudio
    • python3Packages.soundcard.tests
  • 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
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Module updates) Added a release notes entry if the change is significant
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: python 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: qt/kde 8.has: documentation This PR adds or changes documentation 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: xfce The Xfce Desktop Environment 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Dec 30, 2024
@nbraud
Copy link
Contributor Author

nbraud commented Dec 30, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 369391


x86_64-linux

⏩ 1 package blacklisted:
  • nixos-install-tools

@nbraud nbraud added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Dec 30, 2024
@nbraud
Copy link
Contributor Author

nbraud commented Dec 30, 2024

Thanks for the swift review, @fpletz ! ❤️

@nbraud nbraud merged commit 238b407 into NixOS:master Dec 30, 2024
33 of 34 checks passed
@nbraud nbraud deleted the nixos/pulseaudio branch December 30, 2024 13:46
@fpletz
Copy link
Member

fpletz commented Dec 30, 2024

Such cleanups are always appreciated. 😸 I didn't merge right away because I wanted to let this sit for a few days to see if anybody else has any opinions on this. Shouldn't be that controversial, though, so no worries you merged this already. 👍

@nbraud
Copy link
Contributor Author

nbraud commented Dec 30, 2024

I didn't merge right away because I wanted to let this sit for a few days

Ah, sorry, it was so uncontrovertial I thought we were both waiting on CI 😅 (in addition to at least 1 review, of course)

@khaneliman
Copy link
Contributor

khaneliman commented Dec 30, 2024

For some reason, mkRenamedOptionModule doesn't seem to handle mkForce priority on an option properly. So if someone had hardware.pulseaudio.enable = mkForce false they get an error. Just manually switching to services.pulseaudio fixed it for me.

Yes, I'm tracking master as I try to fix my flake from all the package failures :P

@nbraud
Copy link
Contributor Author

nbraud commented Dec 30, 2024

For some reason, mkRenamedOptionModule doesn't seem to handle mkForce priority on an option properly.

Oy vey 😓
I opened #369491 but I'm not up for fixing this... at least until next year 😇

Yes, I'm tracking master as I try to fix my flake from all the package failures :P

And we thank you for stepping on all the rakes and reporting them ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python 6.topic: qt/kde 6.topic: xfce The Xfce Desktop Environment 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants