diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-23 09:40:37 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-23 09:40:37 -0400 |
commit | 18742471aff29270453a540f84d543137ee9d44e (patch) | |
tree | d21863fd81db3722e8cac52b52be3dd1c429cf21 /pkgs/applications/networking | |
parent | 2e831da76da0a51557975a55dc8a18ebf3401bfb (diff) | |
parent | bbcaf78350d87c4657b1a2451132535467a454eb (diff) | |
download | nixlib-18742471aff29270453a540f84d543137ee9d44e.tar nixlib-18742471aff29270453a540f84d543137ee9d44e.tar.gz nixlib-18742471aff29270453a540f84d543137ee9d44e.tar.bz2 nixlib-18742471aff29270453a540f84d543137ee9d44e.tar.lz nixlib-18742471aff29270453a540f84d543137ee9d44e.tar.xz nixlib-18742471aff29270453a540f84d543137ee9d44e.tar.zst nixlib-18742471aff29270453a540f84d543137ee9d44e.zip |
Merge remote-tracking branch 'upstream/master' into staging
Use newer vagrant from master
Diffstat (limited to 'pkgs/applications/networking')
3 files changed, 27 insertions, 3 deletions
diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix new file mode 100644 index 000000000000..b1dcfb809b5d --- /dev/null +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoPackage, fetchFromGitHub, ... }: + +let version = "0.16.0"; in + +buildGoPackage { + name = "helmfile-${version}"; + + src = fetchFromGitHub { + owner = "roboll"; + repo = "helmfile"; + rev = "v${version}"; + sha256 = "12gxlan89h0r83aaacshh58nd1pi26gx5gkna0ksll9wsfvraj4d"; + }; + + goPackagePath = "github.com/roboll/helmfile"; + + meta = { + description = "Deploy Kubernetes Helm charts"; + homepage = https://github.com/roboll/helmfile; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pneumaticat ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 5879c0e83974..38b7e485259a 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -104,8 +104,8 @@ in rec { terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues; terraform_0_11 = pluggable (generic { - version = "0.11.6"; - sha256 = "17kd3ln1i40qb8fll5918rvgackzf1ibmr7li1p9vky4ki3iwr0l"; + version = "0.11.7"; + sha256 = "0q5gl8yn1f8fas1v68lz081k88gbmlk7f2xqlwqmh01qpqjxd42q"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 6801edb9767c..09ead9b3de65 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "All-in-one voice and text chat for gamers that’s free, secure, and works on both your desktop and phone"; + description = "All-in-one cross-platform voice and text chat for gamers"; homepage = https://discordapp.com/; downloadPage = "https://github.com/crmarsh/discord-linux-bugs"; license = licenses.unfree; |