Skip to content

nixos/nomad: fix data_dir-default-not-propagating bug#110614

Merged
roberth merged 2 commits intoNixOS:masterfrom
cpcloud:nomad-mkdefault-data-dir
Jan 23, 2021
Merged

nixos/nomad: fix data_dir-default-not-propagating bug#110614
roberth merged 2 commits intoNixOS:masterfrom
cpcloud:nomad-mkdefault-data-dir

Conversation

@cpcloud
Copy link
Copy Markdown
Contributor

@cpcloud cpcloud commented Jan 23, 2021 •
edited
Loading

  • nixos/nomad: add newline
  • nixos/nomad: move data_dir default setting to allow propagation of default
Motivation for this change

The value of data_dir in the nomad module was only
set to its default if settings was not overridden at all.

This PR fixes the issue so that you can override settings
without having to specify the default value of data_dir.

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.

@cpcloud
Copy link
Copy Markdown
Contributor Author

cpcloud commented Jan 23, 2021

Once #109761 is landed I will update the test here by removing the explicit data_dir setting.

@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 23, 2021
@cpcloud cpcloud requested a review from roberth January 23, 2021 17:57
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jan 23, 2021
@roberth roberth mentioned this pull request Jan 23, 2021
Merged
roberth
roberth approved these changes Jan 23, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@roberth roberth left a comment

Choose a reason for hiding this comment

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

Good catch!
I've mentioned this fix on the RFC 42 PR, because it's an easy mistake to make.

@roberth roberth merged commit e031037 into NixOS:master Jan 23, 2021
@cpcloud cpcloud deleted the nomad-mkdefault-data-dir branch January 23, 2021 22:16
@cpcloud
Copy link
Copy Markdown
Contributor Author

cpcloud commented Jan 23, 2021

Thanks for merging!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@roberth roberth roberth approved these changes

@lovesegfault lovesegfault Awaiting requested review from lovesegfault

@aanderse aanderse Awaiting requested review from aanderse

Assignees

No one assigned

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@cpcloud @roberth