From e3de736b9b867964a3c8920796a6d4096e3489c3 Mon Sep 17 00:00:00 2001 From: Hugo Tavares Reis Date: Mon, 15 May 2017 14:48:27 +0200 Subject: [PATCH 1/2] terraform-inventory: init at 0.7-pre --- .../cluster/terraform-inventory/default.nix | 27 +++++++++++++++++++ .../cluster/terraform-inventory/deps.nix | 20 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 49 insertions(+) create mode 100644 pkgs/applications/networking/cluster/terraform-inventory/default.nix create mode 100644 pkgs/applications/networking/cluster/terraform-inventory/deps.nix diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/applications/networking/cluster/terraform-inventory/default.nix new file mode 100644 index 000000000000..c86b9d2a61b8 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-inventory/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub}: + +buildGoPackage rec { + name = "terraform-inventory-${version}"; + version = "0.7-pre"; + rev = "v${version}"; + + goPackagePath = "github.com/adammck/terraform-inventory"; + + subPackages = [ "./" ]; + + src = fetchFromGitHub { + inherit rev; + owner = "adammck"; + repo = "terraform-inventory"; + sha256 = "0wwyi2nfyn3wfpmvj8aabn0cjba0lpr5nw3rgd6qdywy7sc3rmb1"; + }; + + goDeps = ./deps.nix; + + meta = { + homepage = https://github.com/adammck/terraform-inventory; + description = "Terraform state to ansible inventory adapter"; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-inventory/deps.nix b/pkgs/applications/networking/cluster/terraform-inventory/deps.nix new file mode 100644 index 000000000000..9f7b5e317fe3 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-inventory/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/adammck/venv"; + fetch = { + type = "git"; + url = "https://github.com/adammck/venv"; + rev = "8a9c907a37d36a8f34fa1c5b81aaf80c2554a306"; + sha256 = "1fzk3j4q59kpd2ks2aw8rmic6b123p5mh981cjh0kzs716grc6y8"; + }; + } + { + goPackagePath = "github.com/blang/vfs"; + fetch = { + type = "git"; + url = "https://github.com/blang/vfs"; + rev = "c14afcac17253ce7418da751ec6b1988790cdc8f"; + sha256 = "00q5qzxpn9n59nrmrljz4w9lljxvrr8i5j8i8b4iw86j0alcx53b"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0354c939844..78ddeec41028 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18492,6 +18492,8 @@ with pkgs; terraform_0_9 = terraform_0_9_4; terraform = terraform_0_9; + terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; + terragrunt = callPackage ../applications/networking/cluster/terragrunt {}; terragrunt_0_11_1 = callPackage ../applications/networking/cluster/terragrunt/0.11.1.nix { From 21898ff46016cc314c435e97c2ade9a3162964bf Mon Sep 17 00:00:00 2001 From: Hugo Tavares Reis Date: Sat, 20 May 2017 16:16:44 +0200 Subject: [PATCH 2/2] terraform-inventory: added htr as maintainer --- lib/maintainers.nix | 1 + .../networking/cluster/terraform-inventory/default.nix | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 59675697978f..33e36c56e31f 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -220,6 +220,7 @@ hinton = "Tom Hinton "; hodapp = "Chris Hodapp "; hrdinka = "Christoph Hrdinka "; + htr = "Hugo Tavares Reis "; iand675 = "Ian Duncan "; ianwookim = "Ian-Woo Kim "; igsha = "Igor Sharonov "; diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/applications/networking/cluster/terraform-inventory/default.nix index c86b9d2a61b8..dd4a36807ea1 100644 --- a/pkgs/applications/networking/cluster/terraform-inventory/default.nix +++ b/pkgs/applications/networking/cluster/terraform-inventory/default.nix @@ -18,10 +18,11 @@ buildGoPackage rec { goDeps = ./deps.nix; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/adammck/terraform-inventory; description = "Terraform state to ansible inventory adapter"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.mit; + platforms = platforms.all; + license = licenses.mit; + maintainers = with maintainers; [ htr ]; }; }