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

Jump to bottom

linux: enable SND_OSSEMUL #56043

Merged
merged 1 commit into from Feb 19, 2019
Merged

linux: enable SND_OSSEMUL #56043

merged 1 commit into from Feb 19, 2019

Conversation

lheckemann
Copy link
Member

Motivation for this change

Fixes #54074

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Tested simply using:

import ./make-test.nix ({ pkgs, ...} :
{
  name = "alsa-oss";
  nodes.server.sound.enable = true;
  testScript = ''
    $server->waitForUnit("multi-user.target");
    $server->fail("journalctl -b | grep \"Failed to find module 'snd_pcm_oss'\"");
  '';
})

vcunat
vcunat approved these changes Feb 19, 2019
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Re-checked the test as well, on two linux platforms. I don't really know anything about OSS, but this seems safe and OK.

@lheckemann
Copy link
Member Author

Although, should this go to staging? Forgot that a bunch of stuff depends on linux.

@vcunat
Copy link
Member

vcunat commented Feb 19, 2019

No, we merge kernel-only changes directly to master. It's not that much to rebuild in practice.

@lheckemann
Copy link
Member Author

I've checked that a number of kernels: linux linux_latest linux-libre linux_4_14 linux_4_19 linux_4_4 linux_4_9 linux_hardened still build with this change, so I'll go ahead and merge.

@lheckemann lheckemann merged commit 688ca70 into NixOS:master Feb 19, 2019
@lheckemann lheckemann deleted the ossemul branch February 19, 2019 16:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat approved these changes

Assignees
No one assigned
Labels
6.topic: kernel 10.rebuild-darwin: 0 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@lheckemann @vcunat @GrahamcOfBorg