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.

Sign up for GitHub

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

Fix babeld config #31477

Merged
merged 3 commits into from Nov 14, 2017
Merged

Fix babeld config #31477

merged 3 commits into from Nov 14, 2017

Conversation

andir
Copy link
Member

@andir andir commented Nov 10, 2017

Motivation for this change

The babeld module configuration wasn't working as documented in the examples.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • 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/)
  • Fits CONTRIBUTING.md.

@andir
babeld module: separate default options by space
236a7c5 
In the previous version multiple default values would generate an
invalid babeld config file since all options would be concatenated
without any separator.
@andir
babeld module: support non-boolean default arguments
5d90737 
Previosuly only boolean values would be rendered properly. All other
values would cause an error. Even the example configuration did fail.
@andir
babeld module: updated example config
5feed06 
Previosuly the example config did feature the deprecated `wired`
paramter. Wired can now be configured using the `type` parameter.
@andir
Copy link
Member Author

andir commented Nov 14, 2017

@fpletz Do you mind reviewing? You committed the initial version.

fpletz
fpletz approved these changes Nov 14, 2017
View reviewed changes
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

Ah, I knew there were some issues left but wasn't able to identify them before pushing. It worked for our use case. Thanks a lot for the fixes!

@fpletz fpletz merged commit 06d0ba1 into NixOS:master Nov 14, 2017
@andir andir deleted the fix-babeld-config branch November 14, 2017 12:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz fpletz approved these changes

Assignees
No one assigned
Labels
8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@andir @fpletz @c0bw3b @GrahamcOfBorg