From 6ff45f34d8729d93802d16a1d654b1d7cb168ccb Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Fri, 28 Sep 2018 11:28:38 -0700 Subject: [PATCH] terraform-providers: move ibm and libvirt underneath the terraform-providers --- .../cluster/terraform-providers/default.nix | 11 +++++++++-- .../ibm}/default.nix | 0 .../libvirt}/default.nix | 0 pkgs/top-level/aliases.nix | 2 ++ 4 files changed, 11 insertions(+), 2 deletions(-) rename pkgs/applications/networking/cluster/{terraform-provider-ibm => terraform-providers/ibm}/default.nix (100%) rename pkgs/applications/networking/cluster/{terraform-provider-libvirt => terraform-providers/libvirt}/default.nix (100%) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index a535ab06f453..b3b13539ff50 100644 --- 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/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix similarity index 100% rename from pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix rename to pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix diff --git a/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix similarity index 100% rename from pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix rename to pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6d5d1fe2081c..92a0f2b45709 100644 --- 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