From ef64786cda0607231707c29526555948c085a2d7 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 28 Sep 2018 16:02:51 +0100 Subject: [PATCH] terraform: move providers to terraform-providers Before, providers were only built indirectly. Since proviers don't depend on terraform to build they can be moved into their own collection of packages. This also has the advantage that they can be reached directly using an attribute path (Eg: terraform-providers.nixos). Co-authored-by: Wael Nasreddine --- .../providers => terraform-providers}/data.nix | 0 .../providers => terraform-providers}/default.nix | 0 .../providers => terraform-providers}/providers.txt | 0 .../providers => terraform-providers}/update-all | 0 .../networking/cluster/terraform/default.nix | 11 +++++++++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 9 +++++++-- 7 files changed, 17 insertions(+), 4 deletions(-) rename pkgs/applications/networking/cluster/{terraform/providers => terraform-providers}/data.nix (100%) rename pkgs/applications/networking/cluster/{terraform/providers => terraform-providers}/default.nix (100%) rename pkgs/applications/networking/cluster/{terraform/providers => terraform-providers}/providers.txt (100%) rename pkgs/applications/networking/cluster/{terraform/providers => terraform-providers}/update-all (100%) diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix similarity index 100% rename from pkgs/applications/networking/cluster/terraform/providers/data.nix rename to pkgs/applications/networking/cluster/terraform-providers/data.nix diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix similarity index 100% rename from pkgs/applications/networking/cluster/terraform/providers/default.nix rename to pkgs/applications/networking/cluster/terraform-providers/default.nix diff --git a/pkgs/applications/networking/cluster/terraform/providers/providers.txt b/pkgs/applications/networking/cluster/terraform-providers/providers.txt similarity index 100% rename from pkgs/applications/networking/cluster/terraform/providers/providers.txt rename to pkgs/applications/networking/cluster/terraform-providers/providers.txt diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform-providers/update-all similarity index 100% rename from pkgs/applications/networking/cluster/terraform/providers/update-all rename to pkgs/applications/networking/cluster/terraform-providers/update-all diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 1a88fea3d77..767eb94454d 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,4 +1,11 @@ -{ stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper }: +{ stdenv +, lib +, buildEnv +, buildGoPackage +, fetchFromGitHub +, makeWrapper +, terraform-providers +}: let goPackagePath = "github.com/hashicorp/terraform"; @@ -75,7 +82,7 @@ let }); in withPlugins (_: []); - plugins = import ./providers { inherit lib buildGoPackage fetchFromGitHub; }; + plugins = removeAttrs terraform-providers ["override" "overrideDerivation" "recurseForDerivations"]; in rec { terraform_0_8_5 = generic { version = "0.8.5"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 26bc7ebc6f1..6d5d1fe2081 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -277,6 +277,7 @@ mapAliases ({ telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 telepathy_salut = telepathy-salut; # added 2018-02-25 telnet = inetutils; # added 2018-05-15 + terraform-provider-nixos = terraform-providers.nixos; # added 2018-09-28 tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03 tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03 tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57229f7f547..2c57dac51cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22105,14 +22105,19 @@ with pkgs; terraform = terraform_0_11; terraform-full = terraform_0_11-full; + terraform-providers = recurseIntoAttrs ( + callPackage ../applications/networking/cluster/terraform-providers {} + ); + + terraform-provider-libvirt = callPackage ../applications/networking/cluster/terraform-provider-libvirt {}; + terraform-provider-ibm = callPackage ../applications/networking/cluster/terraform-provider-ibm {}; + terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {}; - terraform-provider-libvirt = callPackage ../applications/networking/cluster/terraform-provider-libvirt {}; - terragrunt = callPackage ../applications/networking/cluster/terragrunt {}; terragrunt_0_11_1 = callPackage ../applications/networking/cluster/terragrunt/0.11.1.nix {