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: fc47846e3912
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 16cc87ca2943
Choose a head ref
  • 3 commits
  • 5 files changed
  • 1 contributor

Commits on Jul 12, 2017

  1. terragrunt: make v0.11.1 use its own deps file

    @peterhoeg
    peterhoeg committed Jul 12, 2017
    Copy the full SHA
    299c57e View commit details

  2. terragrunt: 0.12.16 -> 0.12.24

    @peterhoeg
    peterhoeg committed Jul 12, 2017
    Copy the full SHA
    ef78ff8 View commit details

  3. terraform: disable checks for 0.9 as they are failing again

    @peterhoeg
    peterhoeg committed Jul 12, 2017
    Copy the full SHA
    16cc87c View commit details
3 changes: 2 additions & 1 deletion pkgs/applications/networking/cluster/terraform/default.nix
View file
Original file line number Diff line number Diff line change
@@ -51,6 +51,7 @@ in {
terraform_0_9_11 = generic {
version = "0.9.11";
sha256 = "045zcpd4g9c52ynhgh3213p422ahds63mzhmd2iwcmj88g8i1w6x";
doCheck = true;
# checks are failing again
doCheck = false;
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/networking/cluster/terragrunt/0.11.1.nix
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ buildGoPackage rec {
sha256 = "061ix4m64i8bvjpqm6hn83nnkvqrp5y0hh5gzmxiik2nz3by1rx5";
};

goDeps = ./deps.nix;
goDeps = ./deps_0_11.nix;

buildInputs = [ makeWrapper ];

4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/terragrunt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

buildGoPackage rec {
name = "terragrunt-${version}";
version = "0.12.16";
version = "0.12.24";

goPackagePath = "github.com/gruntwork-io/terragrunt";

src = fetchFromGitHub {
rev = "v${version}";
owner = "gruntwork-io";
repo = "terragrunt";
sha256 = "07xxk7r9wvjv3v0l95g7sy5yphypfxmlymxzi7yv3b8dznifwm0y";
sha256 = "0rkbicvqjadb99qw65g3k7pqal5sn05png30qwy59cv4gjr9q9m4";
};

goDeps = ./deps.nix;
22 changes: 11 additions & 11 deletions pkgs/applications/networking/cluster/terragrunt/deps.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
{
goPackagePath = "github.com/aws/aws-sdk-go";
fetch = {
type = "git";
url = "https://github.com/aws/aws-sdk-go";
rev = "952498f4a390118ac65ad59cbe0c8b57ed69b6b5";
sha256 = "03j2dn4v2wr32jd9iki68ra0r8aghy7hpad94bf8zdgsrjn6rwvj";
rev = "ae53883b2478fd8e2bdca2748367d5b5fa27ca22";
sha256 = "0sa5g69wpk6hbd6g52cc7l5c6zph9zyc5l9dy4288xn4hpb6c23q";
};
}
{
@@ -32,8 +32,8 @@
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-getter";
rev = "90b6568eac830f62a08e8f1f46375daa63e57015";
sha256 = "1cl0yqlhffjmf4qan093z49i88i7wjp9lsfwfzn52sk3c09ksism";
rev = "2814e6fb2ca5b3bd950c97eff22553ecb3c7f77b";
sha256 = "1pkqa5vdyc79iiw25b9vpl9f32nwv2pzh6f98l30678ypha0miqn";
};
}
{
@@ -86,26 +86,26 @@
fetch = {
type = "git";
url = "https://github.com/mitchellh/mapstructure";
rev = "cc8532a8e9a55ea36402aa21efdf403a60d34096";
sha256 = "0705c0hq7b993sabnjy65yymvpy9w1j84bg9bjczh5607z16nw86";
rev = "d0303fe809921458f417bcf828397a65db30a7e4";
sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "4d4bfba8f1d1027c4fdbe371823030df51419987";
sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp";
rev = "f6abca593680b2315d2075e0f5e2a9751e3f431a";
sha256 = "0n2vidr9zyf6k296grnc6d3rk9hd6qw7mwvnfixlxm8g5y46rzl9";
};
}
{
goPackagePath = "github.com/urfave/cli";
fetch = {
type = "git";
url = "https://github.com/urfave/cli";
rev = "d70f47eeca3afd795160003bc6e28b001d60c67c";
sha256 = "1xm203qp4sdlvffcbag7v6mc2d6q61i25iiz3y9yqpy25jpcpgif";
rev = "4b90d79a682b4bf685762c7452db20f2a676ecb2";
sha256 = "0ls3lfmbfwirm9j95b6yrw41wgh72lfkp1cvs873zw04si4yvaqr";
};
}
]
111 changes: 111 additions & 0 deletions pkgs/applications/networking/cluster/terragrunt/deps_0_11.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
[
{
goPackagePath = "github.com/aws/aws-sdk-go";
fetch = {
type = "git";
url = "https://github.com/aws/aws-sdk-go";
rev = "952498f4a390118ac65ad59cbe0c8b57ed69b6b5";
sha256 = "03j2dn4v2wr32jd9iki68ra0r8aghy7hpad94bf8zdgsrjn6rwvj";
};
}
{
goPackagePath = "github.com/bgentry/go-netrc";
fetch = {
type = "git";
url = "https://github.com/bgentry/go-netrc";
rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480";
sha256 = "0dn2h8avgavqdzdqnph8bkhj35bx0wssczry1zdczr22xv650g1l";
};
}
{
goPackagePath = "github.com/go-errors/errors";
fetch = {
type = "git";
url = "https://github.com/go-errors/errors";
rev = "8fa88b06e5974e97fbf9899a7f86a344bfd1f105";
sha256 = "02mvb2clbmfcqb4yclv5zhs4clkk9jxi2hiawsynl5fwmgn0d3xa";
};
}
{
goPackagePath = "github.com/hashicorp/go-getter";
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-getter";
rev = "90b6568eac830f62a08e8f1f46375daa63e57015";
sha256 = "1cl0yqlhffjmf4qan093z49i88i7wjp9lsfwfzn52sk3c09ksism";
};
}
{
goPackagePath = "github.com/hashicorp/go-version";
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-version";
rev = "03c5bf6be031b6dd45afec16b1cf94fc8938bc77";
sha256 = "0sjq57gpfznaqdrbyb2p0bn90g9h661cvr0jrk6ngags4pbw14ik";
};
}
{
goPackagePath = "github.com/hashicorp/hcl";
fetch = {
type = "git";
url = "https://github.com/hashicorp/hcl";
rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca";
sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb";
};
}
{
goPackagePath = "github.com/mattn/go-zglob";
fetch = {
type = "git";
url = "https://github.com/mattn/go-zglob";
rev = "95345c4e1c0ebc9d16a3284177f09360f4d20fab";
sha256 = "012hrd67v4gp3b621rykg2kp6a7iq4dr585qavragbif0z1whckx";
};
}
{
goPackagePath = "github.com/mitchellh/go-homedir";
fetch = {
type = "git";
url = "https://github.com/mitchellh/go-homedir";
rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
};
}
{
goPackagePath = "github.com/mitchellh/go-testing-interface";
fetch = {
type = "git";
url = "https://github.com/mitchellh/go-testing-interface";
rev = "477c2d05a845d8b55912a5a7993b9b24abcc5ef8";
sha256 = "0llpcyiqfjdri7pba1p13maafgcyzjbd29h99b1hgj848k5avd61";
};
}
{
goPackagePath = "github.com/mitchellh/mapstructure";
fetch = {
type = "git";
url = "https://github.com/mitchellh/mapstructure";
rev = "cc8532a8e9a55ea36402aa21efdf403a60d34096";
sha256 = "0705c0hq7b993sabnjy65yymvpy9w1j84bg9bjczh5607z16nw86";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "4d4bfba8f1d1027c4fdbe371823030df51419987";
sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp";
};
}
{
goPackagePath = "github.com/urfave/cli";
fetch = {
type = "git";
url = "https://github.com/urfave/cli";
rev = "d70f47eeca3afd795160003bc6e28b001d60c67c";
sha256 = "1xm203qp4sdlvffcbag7v6mc2d6q61i25iiz3y9yqpy25jpcpgif";
};
}
]