From 5bf656e33b5a1a445c5144b77965c790de2cd286 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 3 Aug 2018 22:39:12 +0200 Subject: terraform: filter out azure-classic while generating data.nix --- pkgs/applications/networking/cluster/terraform/providers/data.nix | 7 ------- .../networking/cluster/terraform/providers/default.nix | 7 +------ .../applications/networking/cluster/terraform/providers/update-all | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) (limited to 'pkgs/applications/networking/cluster/terraform') diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix index d6d29d7863c3..4ae44cafbf44 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix @@ -35,13 +35,6 @@ version = "1.30.0"; sha256 = "1si2fm5nm7gad90lf410zwjf2q5kd8mv6nkkbfnfdzkpkchavr95"; }; - azure-classic = - { - owner = "terraform-providers"; - repo = "terraform-provider-azure-classic"; - version = "0.1.1"; - sha256 = "11myqq3wnxvpysjycvwg7b14ll8d9vkn06xb3r26kmc42fkl5xv1"; - }; azurerm = { owner = "terraform-providers"; diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform/providers/default.nix index cf1649f7bb39..a535ab06f453 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/default.nix @@ -16,10 +16,5 @@ let # if the versions are not provided via file paths. postBuild = "mv go/bin/${repo}{,_v${version}}"; }; - - maybeDrv = name: data: - # azure-classic is an archived repo - if name == "azure-classic" then null - else toDrv data; in - lib.mapAttrs maybeDrv list + lib.mapAttrs (n: v: toDrv v) list diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all index 24695066fa28..31a5a4a750dc 100755 --- a/pkgs/applications/networking/cluster/terraform/providers/update-all +++ b/pkgs/applications/networking/cluster/terraform/providers/update-all @@ -71,7 +71,7 @@ fi org=terraform-providers -repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | sort) +repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | grep -v terraform-provider-azure-classic | sort) # Get all the providers with index -- cgit 1.4.1