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

Update README getting started instructions #60

Merged
merged 3 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ This will leave you with a `flake.nix` file containing some glue code for
getting a Nickel contract out of `tf-ncl`, evaluating a Nickel configuration
and calling Terraform. It's as easy as
```shell
nix run .#terraform -- hello-tf.ncl init
nix run .#terraform -- hello-tf.ncl apply
nix develop -c run-terraform init
nix develop -c run-terraform apply
```

Without Nix it's a bit more complicated. You will need to obtain the Nickel
Expand Down
13 changes: 7 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
utils.url = "github:numtide/flake-utils";
nickel.url = "github:tweag/nickel";
topiary.url = "github:tweag/topiary";
Expand Down Expand Up @@ -34,7 +34,9 @@

pkgs = import inputs.nixpkgs {
localSystem = { inherit system; };
config = { };
config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"terraform"
];
overlays = [
(import inputs.rust-overlay)
];
Expand Down
2 changes: 1 addition & 1 deletion tf-ncl/src/intermediate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ impl FieldDescriptor {
fn push_down(self, schema: &mut HashMap<String, Attribute>) -> Option<Self> {
let (prefix, rest) = self.split_at_first_wildcard();
let Some(attr) = attribute_at_path(schema, prefix) else {
return Some(self)
return Some(self);
};
match &mut attr.type_ {
Type::Dictionary {
Expand Down