diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-02-08 10:12:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-08 10:12:12 +0100 |
| commit | 011134676220d1dee8e89831c28e00bcdca9bfaa (patch) | |
| tree | 6db8e3c2ae0f8d06c756428cbfe492cd630cc536 /pkgs/applications | |
| parent | d2e0fb3122038a404d27815ee30be075cb41e702 (diff) | |
| parent | a9e03c40a1da210c17e3ea6f44a29e443c9d46ab (diff) | |
| download | nixpkgs-011134676220d1dee8e89831c28e00bcdca9bfaa.tar nixpkgs-011134676220d1dee8e89831c28e00bcdca9bfaa.tar.gz nixpkgs-011134676220d1dee8e89831c28e00bcdca9bfaa.tar.bz2 nixpkgs-011134676220d1dee8e89831c28e00bcdca9bfaa.tar.lz nixpkgs-011134676220d1dee8e89831c28e00bcdca9bfaa.tar.xz nixpkgs-011134676220d1dee8e89831c28e00bcdca9bfaa.tar.zst nixpkgs-011134676220d1dee8e89831c28e00bcdca9bfaa.zip | |
Merge pull request #112284 from urbas/terraform-shell-provider-simplify
terraform-providers.shell: uses default model
Diffstat (limited to 'pkgs/applications')
3 files changed, 9 insertions, 33 deletions
diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 3570191fd84..cbabdcac72f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -63,7 +63,6 @@ let libvirt = callPackage ./libvirt {}; linuxbox = callPackage ./linuxbox {}; lxd = callPackage ./lxd {}; - shell = callPackage ./shell {}; vpsadmin = callPackage ./vpsadmin {}; vercel = callPackage ./vercel {}; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 76d36255c71..26304bf0374 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -865,6 +865,15 @@ "sha256": "1fs96qd2b4glk8hhn5m9r04ap679g0kf3nnhjx1a2idqwrv71gcl", "version": "3.3.0" }, + "shell": { + "owner": "scottwinkler", + "provider-source-address": "registry.terraform.io/scottwinkler/shell", + "repo": "terraform-provider-shell", + "rev": "v1.6.0", + "sha256": "0jxb30vw93ibnwz8nfqapac7p9r2famzvsf2h4nfbmhkm6mpan4l", + "vendorSha256": "1p2ja6cw3dl7mx41svri6frjpgb9pxsrl7sq0rk1d3sviw0f88sg", + "version": "1.6.0" + }, "signalfx": { "owner": "terraform-providers", "repo": "terraform-provider-signalfx", diff --git a/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix b/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix deleted file mode 100644 index f2e9b86a646..00000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: -buildGoModule rec { - pname = "terraform-provider-shell"; - version = "1.6.0"; - - src = fetchFromGitHub { - owner = "scottwinkler"; - repo = pname; - rev = "v${version}"; - sha256 = "0jxb30vw93ibnwz8nfqapac7p9r2famzvsf2h4nfbmhkm6mpan4l"; - }; - - vendorSha256 = "1p2ja6cw3dl7mx41svri6frjpgb9pxsrl7sq0rk1d3sviw0f88sg"; - - doCheck = false; - - subPackages = [ "." ]; - - # Terraform allows checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postInstall = "mv $out/bin/${pname}{,_v${version}}"; - - passthru.provider-source-address = "registry.terraform.io/scottwinkler/shell"; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Terraform provider for executing shell commands and saving output to state file"; - changelog = "https://github.com/scottwinkler/terraform-provider-shell/releases/tag/v${version}"; - license = licenses.mpl20; - maintainers = with maintainers; [ mupdt ]; - }; -} |