nixos/home-assistant: allow arbitrary yaml functions #89337
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Mic92
reviewed
Jun 2, 2020
Comment on lines
14
to
15
| # Hack to support secrets, that are encoded as custom yaml objects, | ||
| # https://www.home-assistant.io/docs/configuration/secrets/ |
There was a problem hiding this comment.
Suggested change
| # Hack to support secrets, that are encoded as custom yaml objects, | |
| # https://www.home-assistant.io/docs/configuration/secrets/ | |
| # Hack to support custom yaml objects, | |
| # i.e. secrets: https://www.home-assistant.io/docs/configuration/secrets/ |
Mic92
reviewed
Jun 2, 2020
| @@ -13,7 +13,7 @@ let | |||
| ${pkgs.remarshal}/bin/json2yaml -i ${configJSON} -o $out | |||
| # Hack to support secrets, that are encoded as custom yaml objects, | |||
| # https://www.home-assistant.io/docs/configuration/secrets/ | |||
| sed -i -e "s/'\!secret \(.*\)'/\!secret \1/" $out | |||
| sed -i -e "s/'\!\([^[:space:]]\+\) \(.*\)'/\!\1 \2/" $out | |||
There was a problem hiding this comment.
I wonder if we should allow to escape \! at the beginning of a string:
Suggested change
| sed -i -e "s/'\!\([^[:space:]]\+\) \(.*\)'/\!\1 \2/" $out | |
| sed -i -e "s/'\!\(([a-z_]\+\) \(.*\)'/\!\1 \2/;s/^\!\!/\!/;" $out |
untested, but hopefully comprehensible.
There was a problem hiding this comment.
I understand that as if you want a literal exclamation mark at the beginning of your string use "!!something" => "!something". Is that correct?
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
There was a problem hiding this comment.
My mistake, probably didn't properly update the nixpkgs checkout when testing.
mweinelt
force-pushed
the
hass-yaml-fun
branch
3 times, most recently
from
5a39308
to
1e135e4
Compare
Mic92
reviewed
Jun 2, 2020
ofborg
bot
added
10.rebuild-linux: 1-10
10.rebuild-linux: 1
and removed
10.rebuild-linux: 0
labels
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
I'm trying to load additional themes without specifying them by hand:
Without this patch the resulting config would quote the function call:
This prevents the function calls execution. The same workaround has been in place for the
!secretfunction, let's now extend it to arbitrary functions.Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)@Mic92 @dotlambda