From e4873b913d769040dea81db3a8aa7e9679989cec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 11:39:22 +0000 Subject: [PATCH 1/3] helmfile: 0.118.6 -> 0.119.0 --- pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 856fa51437e8..c4a95b47f522 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,6 +1,6 @@ { lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: -let version = "0.118.6"; in +let version = "0.119.0"; in buildGoModule { pname = "helmfile"; @@ -10,12 +10,12 @@ buildGoModule { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "0zbvz8kn52c1q4yn8n9z4rrf761h495fhjw72x9q1nh44hr7npwd"; + sha256 = "067hlzp87g36wgxankrmd2nva1v40pa31acq1hh0jxyxp98sfgk1"; }; goPackagePath = "github.com/roboll/helmfile"; - vendorSha256 = "0xj14f0yx7x9ziijd1yka1n6kbmmhbibsk3ppp8cn1pqrwgqk7pr"; + vendorSha256 = "11bw10s5wifzw2cy1100hyjv4xv7an7b05lcw6sphwyy56gsp2fy"; nativeBuildInputs = [ makeWrapper ]; From 117909637ca3f7a12023f7736615b889e7cb3f21 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 27 Jun 2020 04:20:00 -0500 Subject: [PATCH 2/3] helmfile: fix sub package --- .../networking/cluster/helmfile/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index c4a95b47f522..b8a636412f6a 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,10 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm }: -let version = "0.119.0"; in - -buildGoModule { +buildGoModule rec { pname = "helmfile"; - inherit version; + version = "0.119.0"; src = fetchFromGitHub { owner = "roboll"; @@ -13,16 +11,13 @@ buildGoModule { sha256 = "067hlzp87g36wgxankrmd2nva1v40pa31acq1hh0jxyxp98sfgk1"; }; - goPackagePath = "github.com/roboll/helmfile"; - vendorSha256 = "11bw10s5wifzw2cy1100hyjv4xv7an7b05lcw6sphwyy56gsp2fy"; nativeBuildInputs = [ makeWrapper ]; - buildFlagsArray = '' - -ldflags= - -X main.Version=${version} - ''; + subPackages = [ "." ]; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/roboll/helmfile/pkg/app/version.Version=${version}" ]; postInstall = '' wrapProgram $out/bin/helmfile \ @@ -36,4 +31,4 @@ buildGoModule { maintainers = with lib.maintainers; [ pneumaticat yurrriq ]; platforms = lib.platforms.unix; }; -} \ No newline at end of file +} From 70b8fec143d9e1aaeee03ae014cde4ddbe7aadd7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 27 Jun 2020 04:21:00 -0500 Subject: [PATCH 3/3] helmfile: 0.119.0 -> 0.119.1 --- 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 b8a636412f6a..e4a6f63b0149 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmfile"; - version = "0.119.0"; + version = "0.119.1"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "067hlzp87g36wgxankrmd2nva1v40pa31acq1hh0jxyxp98sfgk1"; + sha256 = "1j9b0xw59w5ailwa7dqgbsdigviw8ng5r4jbsk9b80izcig805zz"; }; vendorSha256 = "11bw10s5wifzw2cy1100hyjv4xv7an7b05lcw6sphwyy56gsp2fy";