From 42b1a207c9613de73599f7cd04d3ccf71d9b7f62 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 03:59:22 +0000 Subject: [PATCH 1/3] jx: 2.1.90 -> 2.1.121 --- pkgs/applications/networking/cluster/jx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 2f93d566d35..5ae6ddf906f 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "jx"; - version = "2.1.90"; + version = "2.1.121"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "1m2gq1hh8fjgxwx2sipq56q5mlz0m3npnbsw103n2kq4xv1qf3f6"; + sha256 = "0bjpnh962w5wz4gj5my9g52dawxj8zccvpkxlxy1n7c3dkzjxx5j"; }; - vendorSha256 = "0kj6x7323fx1qhrlg789a21mh1fvhil7ng2fhmbmlwq0fcrngdnj"; + vendorSha256 = "0l9djgvnrgdnw7nsf05yq7qpzzzm3gasgh9a7dyc16pp2kxvza6k"; subPackages = [ "cmd/jx" ]; From ca9f18df45cfcfafabf9d7b27a3de8ffb492e6e3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 2 Aug 2020 04:20:00 -0500 Subject: [PATCH 2/3] jx: install completions --- pkgs/applications/networking/cluster/jx/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 5ae6ddf906f..320c9c7d98e 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib, installShellFiles }: buildGoModule rec { pname = "jx"; @@ -15,12 +15,21 @@ buildGoModule rec { subPackages = [ "cmd/jx" ]; + nativeBuildInputs = [ installShellFiles ]; + buildFlagsArray = '' -ldflags= -X github.com/jenkins-x/jx/pkg/version.Version=${version} -X github.com/jenkins-x/jx/pkg/version.Revision=${version} ''; + postInstall = '' + for shell in bash zsh; do + $out/bin/jx completion $shell > jx.$shell + installShellCompletion jx.$shell + done + ''; + meta = with lib; { description = "JX is a command line tool for installing and using Jenkins X."; homepage = "https://jenkins-x.io"; From 368f062ec7bc61d0d531fd8a49e86e8367d94d7e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 2 Aug 2020 04:20:00 -0500 Subject: [PATCH 3/3] jx: update ldflags --- pkgs/applications/networking/cluster/jx/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 320c9c7d98e..c9b63b49d42 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -19,8 +19,10 @@ buildGoModule rec { buildFlagsArray = '' -ldflags= + -s -w -X github.com/jenkins-x/jx/pkg/version.Version=${version} - -X github.com/jenkins-x/jx/pkg/version.Revision=${version} + -X github.com/jenkins-x/jx/pkg/version.Revision=${src.rev} + -X github.com/jenkins-x/jx/pkg/version.GitTreeState=clean ''; postInstall = ''