diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix index b9f28cbd6cb..ae456185a80 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix @@ -1,24 +1,22 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: -buildGoPackage rec { +{ stdenv, fetchFromGitHub, buildGoModule }: +buildGoModule rec { name = "terraform-provider-elasticsearch-${version}"; - version = "0.6.0"; - - goPackagePath = "github.com/phillbaker/terraform-provider-elasticsearch"; - - # ./deps.nix was generated using the work-around described in: - # https://github.com/kamilchm/go2nix/issues/19 - goDeps = ./deps.nix; + version = "0.7.0"; src = fetchFromGitHub { owner = "phillbaker"; repo = "terraform-provider-elasticsearch"; rev = "v${version}"; - sha256 = "04i7jwhm1mg4m8p7y6yg83j76fx0ncallzbza1g1wc5cjjbkvgs2"; + sha256 = "0ci9gcn9ijdbx25wa99iy0b3sl7akqa7b6gi9wnnl1dawpqznj7v"; }; + modSha256 = "1xk21xswqwpv34j4ba4fj8lcbvfdd12x7rq1hrdyd21mdhmrhw0p"; + + subPackages = [ "." ]; + # Terraform allow checking the provider versions, but this breaks # if the versions are not provided via file paths. - postBuild = "mv go/bin/terraform-provider-elasticsearch{,_v${version}}"; + postInstall = "mv $out/bin/terraform-provider-elasticsearch{,_v${version}}"; meta = with stdenv.lib; { description = "Terraform provider for elasticsearch"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/deps.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/deps.nix deleted file mode 100644 index b89e20cd486..00000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/deps.nix +++ /dev/null @@ -1,75 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "512bdaf8bec30abd545b440447cebb57b53d3af9"; - sha256 = "1j7kjk6i8vg4nwlsxjypqz3gc9j1a9x8r3bg99w1x2ap3vrh7sl8"; - }; - } - { - goPackagePath = "github.com/deoxxa/aws_signing_client"; - fetch = { - type = "git"; - url = "https://github.com/deoxxa/aws_signing_client"; - rev = "c20ee106809eacdffcc81ac7cb984261f8e3067e"; - sha256 = "01cw1f6hzgx1df730vdwd7vhbn7yl6zv3sr42iz4sd1dcdqwzlkq"; - }; - } - { - goPackagePath = "github.com/hashicorp/terraform"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/terraform"; - rev = "dbce85d85ff0beebc660b3d1805b4ef15361af00"; - sha256 = "17kd3ln1i40qb8fll5918rvgackzf1ibmr7li1p9vky4ki3iwr0l"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; - sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; - }; - } - { - goPackagePath = "github.com/olivere/elastic"; - fetch = { - type = "git"; - url = "https://github.com/olivere/elastic"; - rev = "2a5234d20b058173aaea6835e671fc83eee777b0"; - sha256 = "08r62d29m6f7d5hwb9zm5b612wbvzd9sn97nb48q174gbk8685yw"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "816c9085562cd7ee03e7f8188a1cfd942858cded"; - sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k"; - }; - } - { - goPackagePath = "gopkg.in/olivere/elastic.v5"; - fetch = { - type = "git"; - url = "https://gopkg.in/olivere/elastic.v5"; - rev = "b708306d715bea9b983685e94ab4602cdc9f988b"; - sha256 = "0ks0h0ik0aqjm8dm2imbyd1z7rfmqiwilf3bc9nnplp9hc07471y"; - }; - } - { - goPackagePath = "gopkg.in/olivere/elastic.v6"; - fetch = { - type = "git"; - url = "https://gopkg.in/olivere/elastic.v6"; - rev = "e6cae211ee802eab70248a68fe2cb03b616744c9"; - sha256 = "0nbf4mr31gxm4zn5w362y22mh98ckl3d0bxli4f3rwx6zw12arfg"; - }; - } -]