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/nncp: refactor configuration merging #347262

Merged
merged 1 commit into from
Oct 9, 2024
Merged

nixos/nncp: refactor configuration merging #347262

merged 1 commit into from
Oct 9, 2024

Conversation

ehmry
Copy link
Contributor

@ehmry ehmry commented Oct 8, 2024

The NNCP utilities have poor support for configuration merging so use jq and hjson-cli instead.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • 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
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@nagy
Copy link
Member

nagy commented Oct 8, 2024

You could make use of systemd.services.<name>.path to make the script itself a bit shorter, but this is just a stylistic preference.

https://search.nixos.org/options?channel=unstable&show=systemd.services.%3Cname%3E.path

Further, to remove the need for temporary files, you could utilize the implicit stdout of the for loop to merge everything in one go:

for file in *.hjson ; do hjson-cli -j "$file" ; done| jq --slurp add

This is untested.

@ehmry
Copy link
Contributor Author

ehmry commented Oct 8, 2024

@nagy, yes that does work and it's much cleaner, thanks.

nixos/modules/programs/nncp.nix Outdated Show resolved Hide resolved
The NNCP utilities have poor support for configuration merging so
use jq and hjson-cli instead.
@ehmry ehmry merged commit 7f63bcb into NixOS:master Oct 9, 2024
23 checks passed
@ehmry ehmry deleted the nncp branch October 9, 2024 09:07
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.

2 participants