From 6ff45f34d8729d93802d16a1d654b1d7cb168ccb Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Fri, 28 Sep 2018 11:28:38 -0700 Subject: terraform-providers: move ibm and libvirt underneath the terraform-providers --- .../cluster/terraform-provider-ibm/default.nix | 38 ----------------- .../cluster/terraform-provider-libvirt/default.nix | 47 ---------------------- .../cluster/terraform-providers/default.nix | 11 ++++- .../cluster/terraform-providers/ibm/default.nix | 38 +++++++++++++++++ .../terraform-providers/libvirt/default.nix | 47 ++++++++++++++++++++++ 5 files changed, 94 insertions(+), 87 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix delete mode 100644 pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix create mode 100644 pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix create mode 100644 pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix deleted file mode 100644 index fddf13795f3e..000000000000 --- a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: - -# -# USAGE: -# install the following package globally or in nix-shell: -# -# (terraform.withPlugins ( plugins: [ terraform-provider-ibm ])) -# -# examples: -# https://github.com/IBM-Cloud/terraform-provider-ibm/tree/master/examples -# - -buildGoPackage rec { - name = "terraform-provider-ibm-${version}"; - version = "0.11.1"; - - goPackagePath = "github.com/terraform-providers/terraform-provider-ibm"; - subPackages = [ "./" ]; - - src = fetchFromGitHub { - owner = "IBM-Cloud"; - repo = "terraform-provider-ibm"; - sha256 = "1vp1kzadfkacn6c4illxjra8yki1fx7h77b38fixkcvc79mzasmv"; - rev = "v${version}"; - }; - - # Terraform allow checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postBuild = "mv go/bin/terraform-provider-ibm{,_v${version}}"; - - meta = with stdenv.lib; { - homepage = https://github.com/IBM-Cloud/terraform-provider-ibm; - description = "Terraform provider is used to manage IBM Cloud resources."; - platforms = platforms.all; - license = licenses.mpl20; - maintainers = with maintainers; [ jensbin ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix deleted file mode 100644 index 2beceddc7fba..000000000000 --- a/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig, makeWrapper, cdrtools }: - -# USAGE: -# install the following package globally or in nix-shell: -# -# (terraform.withPlugins (old: [terraform-provider-libvirt])) -# -# configuration.nix: -# -# virtualisation.libvirtd.enable = true; -# -# terraform-provider-libvirt does not manage pools at the moment: -# -# $ virsh --connect "qemu:///system" pool-define-as default dir - - - - /var/lib/libvirt/images -# $ virsh --connect "qemu:///system" pool-start default -# -# pick an example from (i.e ubuntu): -# https://github.com/dmacvicar/terraform-provider-libvirt/tree/master/examples - -buildGoPackage rec { - name = "terraform-provider-libvirt-${version}"; - version = "0.4"; - - goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt"; - - src = fetchFromGitHub { - owner = "dmacvicar"; - repo = "terraform-provider-libvirt"; - rev = "v${version}"; - sha256 = "05jkjp1kis4ncryv34pkb9cz2yhzbwg62x9qmlqsqlxwz9hqny3r"; - }; - - buildInputs = [ libvirt pkgconfig makeWrapper ]; - - # mkisofs needed to create ISOs holding cloud-init data, - # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 - propagatedBuildInputs = [ cdrtools ]; - - meta = with stdenv.lib; { - homepage = https://github.com/dmacvicar/terraform-provider-libvirt; - description = "Terraform provider for libvirt"; - platforms = platforms.linux; - license = licenses.asl20; - maintainers = with maintainers; [ mic92 ]; - }; -} - 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-providers/ibm/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix new file mode 100644 index 000000000000..fddf13795f3e --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix @@ -0,0 +1,38 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +# +# USAGE: +# install the following package globally or in nix-shell: +# +# (terraform.withPlugins ( plugins: [ terraform-provider-ibm ])) +# +# examples: +# https://github.com/IBM-Cloud/terraform-provider-ibm/tree/master/examples +# + +buildGoPackage rec { + name = "terraform-provider-ibm-${version}"; + version = "0.11.1"; + + goPackagePath = "github.com/terraform-providers/terraform-provider-ibm"; + subPackages = [ "./" ]; + + src = fetchFromGitHub { + owner = "IBM-Cloud"; + repo = "terraform-provider-ibm"; + sha256 = "1vp1kzadfkacn6c4illxjra8yki1fx7h77b38fixkcvc79mzasmv"; + rev = "v${version}"; + }; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postBuild = "mv go/bin/terraform-provider-ibm{,_v${version}}"; + + meta = with stdenv.lib; { + homepage = https://github.com/IBM-Cloud/terraform-provider-ibm; + description = "Terraform provider is used to manage IBM Cloud resources."; + platforms = platforms.all; + license = licenses.mpl20; + maintainers = with maintainers; [ jensbin ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix new file mode 100644 index 000000000000..2beceddc7fba --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -0,0 +1,47 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig, makeWrapper, cdrtools }: + +# USAGE: +# install the following package globally or in nix-shell: +# +# (terraform.withPlugins (old: [terraform-provider-libvirt])) +# +# configuration.nix: +# +# virtualisation.libvirtd.enable = true; +# +# terraform-provider-libvirt does not manage pools at the moment: +# +# $ virsh --connect "qemu:///system" pool-define-as default dir - - - - /var/lib/libvirt/images +# $ virsh --connect "qemu:///system" pool-start default +# +# pick an example from (i.e ubuntu): +# https://github.com/dmacvicar/terraform-provider-libvirt/tree/master/examples + +buildGoPackage rec { + name = "terraform-provider-libvirt-${version}"; + version = "0.4"; + + goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt"; + + src = fetchFromGitHub { + owner = "dmacvicar"; + repo = "terraform-provider-libvirt"; + rev = "v${version}"; + sha256 = "05jkjp1kis4ncryv34pkb9cz2yhzbwg62x9qmlqsqlxwz9hqny3r"; + }; + + buildInputs = [ libvirt pkgconfig makeWrapper ]; + + # mkisofs needed to create ISOs holding cloud-init data, + # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 + propagatedBuildInputs = [ cdrtools ]; + + meta = with stdenv.lib; { + homepage = https://github.com/dmacvicar/terraform-provider-libvirt; + description = "Terraform provider for libvirt"; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = with maintainers; [ mic92 ]; + }; +} + -- cgit 1.4.1