Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a908f2a3df4d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: da7e4ce1ad82
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on May 20, 2017

  1. terraform-inventory: init at 0.7-pre

    @htr
    htr committed May 20, 2017
    Copy the full SHA
    e3de736 View commit details

  2. terraform-inventory: added htr as maintainer

    @htr
    htr committed May 20, 2017
    Copy the full SHA
    21898ff View commit details

  3. Merge pull request #25801 from htr/add-terraform-inventory 

    terraform-inventory: init at 0.7-pre
    @Mic92
    Mic92 authored May 20, 2017
    Copy the full SHA
    da7e4ce View commit details
1 change: 1 addition & 0 deletions lib/maintainers.nix
View file
Original file line number Diff line number Diff line change
@@ -220,6 +220,7 @@
hinton = "Tom Hinton <t@larkery.com>";
hodapp = "Chris Hodapp <hodapp87@gmail.com>";
hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>";
htr = "Hugo Tavares Reis <hugo@linux.com>";
iand675 = "Ian Duncan <ian@iankduncan.com>";
ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
igsha = "Igor Sharonov <igor.sharonov@gmail.com>";
28 changes: 28 additions & 0 deletions pkgs/applications/networking/cluster/terraform-inventory/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ 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 = with stdenv.lib; {
homepage = https://github.com/adammck/terraform-inventory;
description = "Terraform state to ansible inventory adapter";
platforms = platforms.all;
license = licenses.mit;
maintainers = with maintainers; [ htr ];
};
}
20 changes: 20 additions & 0 deletions pkgs/applications/networking/cluster/terraform-inventory/deps.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
};
}
]
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -18493,6 +18493,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 {