diff options
4 files changed, 9 insertions, 38 deletions
diff --git a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix deleted file mode 100644 index b8e3c1540e9..00000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, fetchFromGitHub, buildGoPackage }: -buildGoPackage rec { - pname = "terraform-provider-ansible"; - version = "1.0.3"; - - goPackagePath = "github.com/nbering/terraform-provider-ansible"; - goDeps = ./deps.nix; - - src = fetchFromGitHub { - owner = "nbering"; - repo = "terraform-provider-ansible"; - rev = "v${version}"; - sha256 = "0dqi9ym0xvnz3h73cmd1vf6k2qwfhxvj1mcakkpmsd4cpxq4l6pr"; - }; - - # Terraform allow checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postBuild = "mv go/bin/terraform-provider-ansible{,_v${version}}"; - - meta = with lib; { - description = "A Terraform provider serving as an interop layer for an Ansible dynamic inventory script."; - homepage = "https://github.com/nbering/terraform-provider-ansible"; - license = licenses.mpl20; - maintainers = with maintainers; [ uskudnik ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/ansible/deps.nix b/pkgs/applications/networking/cluster/terraform-providers/ansible/deps.nix deleted file mode 100644 index dc49f24afa5..00000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/ansible/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "github.com/hashicorp/terraform"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/terraform"; - rev = "v0.12.5"; - sha256 = "0p064rhaanwx4szs8hv6mdqad8d2bgfd94h2la11j58xbsxc7hap"; - }; - } -] diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index e86bd7df987..324994e27f8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -53,7 +53,6 @@ let # These are the providers that don't fall in line with the default model special-providers = { # Packages that don't fit the default model - ansible = callPackage ./ansible { }; cloudfoundry = callPackage ./cloudfoundry { }; gandi = callPackage ./gandi { }; hcloud = callPackage ./hcloud { }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2dda8cee9ff..29dca5d9708 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -43,6 +43,15 @@ "vendorSha256": "18chs2723i2cxhhm649mz52pp6wrfqzxgk12zxq9idrhicchqnzg", "version": "1.149.0" }, + "ansible": { + "owner": "nbering", + "provider-source-address": "registry.terraform.io/nbering/ansible", + "repo": "terraform-provider-ansible", + "rev": "v1.0.4", + "sha256": "1djjcrcm9218rfn51kpzp3cbb5qbkfwpjqm9h9rhadibbvjmly6y", + "vendorSha256": "1kc47n1janmiwwjphvxpily3dwyy1axxh36aj3sb2kpawi4pq1rq", + "version": "1.0.4" + }, "archive": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/archive", |