nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-18 02:44:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

terraform: move providers to terraform-providers

Browse Source 
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 <wael.nasreddine@gmail.com>
This commit is contained in:
zimbatm 2018-09-28 16:02:51 +01:00 committed by Wael M. Nasreddine
parent 7dadabb22c
commit ef64786cda
No known key found for this signature in database
GPG Key ID: 82AE0A31B33CEFCF
7 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/applications/networking/cluster/terraform/providers/data.nix → pkgs/applications/networking/cluster/terraform-providers/data.nix
View File

0
pkgs/applications/networking/cluster/terraform/providers/default.nix → pkgs/applications/networking/cluster/terraform-providers/default.nix
View File

0
pkgs/applications/networking/cluster/terraform/providers/providers.txt → pkgs/applications/networking/cluster/terraform-providers/providers.txt
View File

0
pkgs/applications/networking/cluster/terraform/providers/update-all → pkgs/applications/networking/cluster/terraform-providers/update-all
View File

11
pkgs/applications/networking/cluster/terraform/default.nix
View File

@ -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";

1
pkgs/top-level/aliases.nix
View File

@ -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

9
pkgs/top-level/all-packages.nix
View File

@ -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 {