From 03e564f3d8bff9cebeffaafb21c9ae2d0fe7f63f Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Mon, 29 Sep 2025 18:37:31 +0200 Subject: [PATCH] factor out TF setup Signed-off-by: Kiara Grouwstra --- deployment/run/tf-proxmox/setup.nix | 16 ---------------- deployment/run/tf-proxmox/tf-env.nix | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 deployment/run/tf-proxmox/setup.nix diff --git a/deployment/run/tf-proxmox/setup.nix b/deployment/run/tf-proxmox/setup.nix deleted file mode 100644 index 4166812e..00000000 --- a/deployment/run/tf-proxmox/setup.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - pkgs, - lib, - sources, -}: -pkgs.writeScriptBin "setup" '' - set -xe - # calculated pins - echo '${lib.strings.toJSON sources}' > ./.npins.json - # generate TF lock for nix's TF providers - rm -rf .terraform/ - rm -f .terraform.lock.hcl - # suppress warning on architecture-specific generated lock file: - # `Warning: Incomplete lock file information for providers`. - tofu init -input=false 1>/dev/null -'' diff --git a/deployment/run/tf-proxmox/tf-env.nix b/deployment/run/tf-proxmox/tf-env.nix index 54c7fcc8..a2b03f4e 100644 --- a/deployment/run/tf-proxmox/tf-env.nix +++ b/deployment/run/tf-proxmox/tf-env.nix @@ -14,7 +14,7 @@ pkgs.stdenv.mkDerivation { }; buildInputs = [ (pkgs.callPackage ./tf.nix { inherit sources; }) - (pkgs.callPackage ./setup.nix { inherit sources; }) + (pkgs.callPackage ../tf-setup.nix { inherit sources; }) ]; buildPhase = '' runHook preBuild