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

cjdns: add extraConfig option #53502

Merged
merged 1 commit into from Aug 18, 2019
Merged

cjdns: add extraConfig option #53502

merged 1 commit into from Aug 18, 2019

Conversation

elitak
Copy link
Contributor

@elitak elitak commented Jan 6, 2019

Motivation for this change

Added extraConfig option so that we don't need to provide the entire configuration to add 1 line. There was a comment that described that this was infeasible because the JSON generated was "wacky", but I've been unable to detect any wackiness after doing a simple recursiveUpdate...

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) 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/)
  • 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.

@elitak elitak requested a review from infinisil as a code owner January 6, 2019 15:26
@infinisil infinisil dismissed their stale review February 3, 2019 14:40

Not necessary

@infinisil
Copy link
Member

Please format your commit message according to the Contribution Guidelines, also linked to from the PR template.

@mmahut
Copy link
Member

mmahut commented Aug 18, 2019

Are there any updates on this pull request, please?

@elitak
Copy link
Contributor Author

elitak commented Aug 18, 2019

I think it's good to go. I've been using it in my local branch for months, now.

@mmahut
Copy link
Member

mmahut commented Aug 18, 2019

@GrahamcOfBorg test cjdns

@mmahut mmahut merged commit ccf3557 into NixOS:master Aug 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil infinisil approved these changes

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@elitak @infinisil @mmahut @GrahamcOfBorg