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

nixos/yggdrasil: fix for configFile option #74828

Merged
merged 1 commit into from Dec 7, 2019
Merged

nixos/yggdrasil: fix for configFile option #74828

merged 1 commit into from Dec 7, 2019

Conversation

ehmry
Copy link
Contributor

@ehmry ehmry commented Dec 2, 2019

Motivation for this change

The configFile was not being merged with the declarative configuration at
runtime. Having configFile is important because it allows for key delivery with Nixops.

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 nix-review --run "nix-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.
Notify maintainers

cc @gazally

@ehmry
nixos/yggdrasil: fix for configFile option
eb2e176 
The configFile was not being merged with the declarative configuration at
runtime.
Lassulus
Lassulus approved these changes Dec 7, 2019
View reviewed changes
Copy link
Member

@Lassulus Lassulus left a comment

Choose a reason for hiding this comment

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

LGTM

@Lassulus Lassulus merged commit 6c1c99d into NixOS:master Dec 7, 2019
@ehmry ehmry deleted the yggdrasil branch December 19, 2019 03:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Lassulus Lassulus Lassulus approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 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
2 participants
@ehmry @Lassulus