From 75572091cd65fa76a45b2f0e68b458d8de6b3aaa Mon Sep 17 00:00:00 2001 From: Samuel Noordhuis Date: Wed, 24 Mar 2021 12:34:17 +1100 Subject: [PATCH] tanka: 0.14.0 -> 0.15.0 Update Tanka to the latest release. Change `meta.homepage` to point to the Tanka website instead of the GitHub repository. Add the `subPackage` attribute and additional ldflags arguments to `buildFlagsArray`. Both are needed to fix the issue where `tk --version` would print `dev` instead of the version string. The ldflags arguments were copied from the Makefile in the Tanka repository. --- pkgs/applications/networking/cluster/tanka/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index 44ad3dfd72c7..8e7731590aad 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,20 +2,22 @@ buildGoModule rec { pname = "tanka"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-y2HhtYKgC9Y397dZ14eQoPZxqS1fTOXVD8B4wdLIHzM="; + sha256 = "sha256-ckXvDB3TU9HAXowAAr/fRmX3mylVvPKW8I74R/vUaRY="; }; vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw="; doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + subPackages = [ "cmd/tk" ]; + + buildFlagsArray = [ "-ldflags=-s -w -extldflags \"-static\" -X github.com/grafana/tanka/pkg/tanka.CURRENT_VERSION=v${version}" ]; nativeBuildInputs = [ installShellFiles ]; @@ -26,7 +28,7 @@ buildGoModule rec { meta = with lib; { description = "Flexible, reusable and concise configuration for Kubernetes"; - homepage = "https://github.com/grafana/tanka/"; + homepage = "https://tanka.dev"; license = licenses.asl20; maintainers = with maintainers; [ mikefaille ]; platforms = platforms.unix;