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/corerad: use passAsFile while converting settings JSON to TOML #90380

Merged
merged 1 commit into from Jun 14, 2020
Merged

nixos/corerad: use passAsFile while converting settings JSON to TOML #90380

merged 1 commit into from Jun 14, 2020

Conversation

mdlayher
Copy link
Member

Signed-off-by: Matt Layher mdlayher@gmail.com

Motivation for this change

Handle a possible issue with single quoting in JSON by using passAsFile to convert JSON to TOML using an intermediary file. Reported by "clever" in #nixos-on-your-router.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

/cc @infinisil due to reviewing the previous PR: #89781, and @cleverca22 (I assume you are clever from IRC, but if not, apologies!)

Signed-off-by: Matt Layher <mdlayher@gmail.com>
@mdlayher
Copy link
Member Author

@GrahamcOfBorg test corerad

@infinisil
Copy link
Member

I thought about this in the original PR, but didn't bother mentioning it :P (also since #75584 implements it correctly anyways, which would be used in the future).

@infinisil infinisil merged commit 4c67f87 into NixOS:master Jun 14, 2020
@mdlayher mdlayher deleted the mdl-corerad-passasfile branch June 14, 2020 22:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants