diff --git a/deployment/check/data-model-tf/default.nix b/deployment/check/data-model-tf/default.nix index 2ea10769..8361293e 100644 --- a/deployment/check/data-model-tf/default.nix +++ b/deployment/check/data-model-tf/default.nix @@ -6,7 +6,9 @@ let overlay = _: prev: { - terraform-backend = prev.callPackage ../../modules/terraform-backend/package.nix { }; + terraform-backend = + prev.callPackage "${sources.nixpkgs-unstable}/pkgs/by-name/te/terraform-backend/package.nix" + { }; # FIXME centralize overlays # XXX using recent revision for https://github.com/NixOS/nixpkgs/pull/447849 opentofu = diff --git a/deployment/modules/terraform-backend/package.nix b/deployment/modules/terraform-backend/package.nix deleted file mode 100644 index 58d73d92..00000000 --- a/deployment/modules/terraform-backend/package.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -# FIXME upstream: https://github.com/NixOS/nixpkgs/pull/447753 -buildGoModule rec { - pname = "terraform-backend"; - version = "0.1.3"; - - src = fetchFromGitHub { - owner = "nimbolus"; - repo = "terraform-backend"; - tag = "v${version}"; - hash = "sha256-S3ih7dLSQs3xJMHyQyWy43OG1maizBPVT8IsrWcSRUM="; - }; - - vendorHash = "sha256-5L8MNhjEPI3OOmtHdkB9ZQp02d7nzPp5h0/gVHTiCws="; - - ldflags = [ - "-s" - "-w" - ]; - - meta = { - description = "State backend server which implements the Terraform HTTP backend API with pluggable modules for authentication, storage, locking and state encryption"; - homepage = "https://github.com/nimbolus/terraform-backend"; - license = lib.licenses.bsd3; - mainProgram = "cmd"; - }; -} diff --git a/npins/sources.json b/npins/sources.json index c23f4a34..35452a17 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -189,9 +189,9 @@ }, "branch": "nixpkgs-unstable", "submodules": false, - "revision": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10", - "url": "https://github.com/nixos/nixpkgs/archive/d7f52a7a640bc54c7bb414cca603835bf8dd4b10.tar.gz", - "hash": "0c9kjncpmbdx6gwww9fn81hyr3bngi4hg51g4n2q4808c321kf4j" + "revision": "2dad7af78a183b6c486702c18af8a9544f298377", + "url": "https://github.com/nixos/nixpkgs/archive/2dad7af78a183b6c486702c18af8a9544f298377.tar.gz", + "hash": "12icrzyc8h6yh5c60wdhaypzc17ygwz664h92jj112pf6whgi2id" }, "proxmox-nixos": { "type": "Git",