From 53d688a3bfc0796f90968a4700ba67698297f347 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 10 Jan 2018 09:47:52 +0000
Subject: [PATCH] terraform: export full packages with plugins

---
 pkgs/applications/networking/cluster/terraform/default.nix | 6 +++++-
 pkgs/top-level/all-packages.nix                            | 7 +++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index a7c5bf4046bf..54a54b37cadb 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -72,7 +72,7 @@ let
     in withPlugins (_: []);
 
   plugins = import ./providers { inherit stdenv lib buildGoPackage fetchFromGitHub; };
-in {
+in rec {
   terraform_0_8_5 = generic {
     version = "0.8.5";
     sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09";
@@ -97,10 +97,14 @@ in {
     passthru = { inherit plugins; };
   });
 
+  terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues;
+
   terraform_0_11 = pluggable (generic {
     version = "0.11.1";
     sha256 = "04qyhlif3b3kjs3m6c3mx45sgr5r13x55aic638zzlrhbpmqiih1";
     patches = [ ./provider-path.patch ];
     passthru = { inherit plugins; };
   });
+
+  terraform_0_11-full = terraform_0_11.withPlugins lib.attrValues;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0d310984ffe..128a240a29a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19830,14 +19830,13 @@ with pkgs;
     terraform_0_8
     terraform_0_9
     terraform_0_10
+    terraform_0_10-full
     terraform_0_11
+    terraform_0_11-full
     ;
 
-  # Terraform with all the plugins, both to get Hydra to build all plugins for us and for
-  # convenience if someone doesn't want to have to think about which plugins to use.
-  terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues;
-
   terraform = terraform_0_11;
+  terraform-full = terraform_0_11-full;
 
   terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};