From 7dddfaa546a08460c44501984646edb977f80b79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 3 Nov 2023 10:35:35 +0100 Subject: [PATCH] make terraform hallal --- devShells/flake-module.nix | 7 +++++-- flake.nix | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/devShells/flake-module.nix b/devShells/flake-module.nix index e30a625..e39faa3 100644 --- a/devShells/flake-module.nix +++ b/devShells/flake-module.nix @@ -2,6 +2,7 @@ perSystem = { inputs' , pkgs + , lib , ... }: { devShells.default = pkgs.mkShellNoCC { @@ -11,13 +12,15 @@ inputs'.clan-core.packages.clan-cli - (pkgs.terraform.withPlugins (p: [ + ((pkgs.terraform.withPlugins (p: [ p.hetznerdns p.hcloud p.null p.external p.local - ])) + ])).overrideAttrs (old: { + meta = old.meta // { license = lib.licenses.free; }; + })) ]; inputsFrom = [ inputs'.clan-core.devShells.default diff --git a/flake.nix b/flake.nix index e6db5c1..50ef145 100644 --- a/flake.nix +++ b/flake.nix @@ -48,7 +48,7 @@ perSystem = ({ lib, self', system, ... }: { treefmt = { projectRootFile = ".git/config"; - programs.terraform.enable = true; + programs.hclfmt.enable = true; programs.nixpkgs-fmt.enable = true; settings.formatter.nixpkgs-fmt.excludes = [ # generated files