terraform-providers: move ibm and libvirt underneath the terraform-pr…

…oviders
NixOS · Sep 28, 2018 · 6ff45f3 · 6ff45f3
1 parent ef64786
commit 6ff45f3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -1,4 +1,8 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib
+, buildGoPackage
+, fetchFromGitHub
+, callPackage
+}:
 let
   list = import ./data.nix;
 
@@ -17,4 +21,7 @@ let
       postBuild = "mv go/bin/${repo}{,_v${version}}";
     };
 in
-  lib.mapAttrs (n: v: toDrv v) list
+  {
+    ibm = callPackage ./ibm {};
+    libvirt = callPackage ./libvirt {};
+  } // lib.mapAttrs (n: v: toDrv v) list
diff --git a/...luster/terraform-provider-ibm/default.nix → ...uster/terraform-providers/ibm/default.nix b/...luster/terraform-provider-ibm/default.nix → ...uster/terraform-providers/ibm/default.nix
diff --git a/...er/terraform-provider-libvirt/default.nix → ...r/terraform-providers/libvirt/default.nix b/...er/terraform-provider-libvirt/default.nix → ...r/terraform-providers/libvirt/default.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
@@ -277,6 +277,8 @@ 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-ibm = terraform-providers.ibm; # added 2018-09-28
+  terraform-provider-libvirt = terraform-providers.libvirt; # added 2018-09-28
   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