summary refs log tree commit diff
path: root/pkgs/applications/networking/cluster/tanka
diff options
context:
space:
mode:
authorSamuel Noordhuis <samuel@snoord.com>2021-03-24 12:34:17 +1100
committerSamuel Noordhuis <samuel@snoord.com>2021-03-24 12:34:17 +1100
commit75572091cd65fa76a45b2f0e68b458d8de6b3aaa (patch)
tree27b297f3f40920210ed308712073522cbd4c5316 /pkgs/applications/networking/cluster/tanka
parent9677d30d773021b9237e8130f5ba2879bf954354 (diff)
downloadnixpkgs-75572091cd65fa76a45b2f0e68b458d8de6b3aaa.tar
nixpkgs-75572091cd65fa76a45b2f0e68b458d8de6b3aaa.tar.gz
nixpkgs-75572091cd65fa76a45b2f0e68b458d8de6b3aaa.tar.bz2
nixpkgs-75572091cd65fa76a45b2f0e68b458d8de6b3aaa.tar.lz
nixpkgs-75572091cd65fa76a45b2f0e68b458d8de6b3aaa.tar.xz
nixpkgs-75572091cd65fa76a45b2f0e68b458d8de6b3aaa.tar.zst
nixpkgs-75572091cd65fa76a45b2f0e68b458d8de6b3aaa.zip
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.
Diffstat (limited to 'pkgs/applications/networking/cluster/tanka')
-rw-r--r--pkgs/applications/networking/cluster/tanka/default.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix
index 44ad3dfd72c..8e7731590aa 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;