From 2c78c378b7c45b8b59fa420e9bac53655dd9164b Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Sat, 16 Jun 2018 08:38:32 -0400 Subject: [PATCH 1/2] helmfile: 0.16.0 -> 0.19.0 --- pkgs/applications/networking/cluster/helmfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index b1dcfb809b5..7f07fcc486d 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.16.0"; in +let version = "0.19.0"; in buildGoPackage { name = "helmfile-${version}"; @@ -9,7 +9,7 @@ buildGoPackage { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "12gxlan89h0r83aaacshh58nd1pi26gx5gkna0ksll9wsfvraj4d"; + sha256 = "0wjzzaygdnnvyi5a78bhmz2sxc4gykdl00h78dkgvj7aaw05s9yd"; }; goPackagePath = "github.com/roboll/helmfile"; From 37804741b518f889eecde85f8c5cc17f0a83d640 Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Sat, 16 Jun 2018 08:38:50 -0400 Subject: [PATCH 2/2] helmfile: add helm to path with wrapProgram Helmfile makes direct calls to `helm` as an implicit dependency. Now helmfile can work without Helm also being explicitly installed. --- .../networking/cluster/helmfile/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 7f07fcc486d..358f4cdb7df 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub, ... }: +{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: let version = "0.19.0"; in @@ -14,6 +14,14 @@ buildGoPackage { goPackagePath = "github.com/roboll/helmfile"; + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $bin/bin/helmfile \ + --prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]} + ''; + + meta = { description = "Deploy Kubernetes Helm charts"; homepage = https://github.com/roboll/helmfile;