summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
author06kellyjac <dev@j-k.io>2021-03-11 14:13:44 +0000
committer06kellyjac <dev@j-k.io>2021-03-11 14:13:44 +0000
commitb1f2dc3cabbaea55f9a3063016776e8b12ace7bc (patch)
treeff6837a80a49854a8855bc2169a51fd7e30418f8 /pkgs
parentcf131dbcbee52c8dddc26928a555c69ea2e13bc9 (diff)
downloadnixpkgs-b1f2dc3cabbaea55f9a3063016776e8b12ace7bc.tar
nixpkgs-b1f2dc3cabbaea55f9a3063016776e8b12ace7bc.tar.gz
nixpkgs-b1f2dc3cabbaea55f9a3063016776e8b12ace7bc.tar.bz2
nixpkgs-b1f2dc3cabbaea55f9a3063016776e8b12ace7bc.tar.lz
nixpkgs-b1f2dc3cabbaea55f9a3063016776e8b12ace7bc.tar.xz
nixpkgs-b1f2dc3cabbaea55f9a3063016776e8b12ace7bc.tar.zst
nixpkgs-b1f2dc3cabbaea55f9a3063016776e8b12ace7bc.zip
kube3d: 4.2.0 -> 4.3.0
- Bump k3sVersion to match official release
- Set buildFlagsArray in bash
- Add changelog
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/cluster/kube3d/default.nix20
1 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index 5bfceefad5a..8f445315160 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -1,8 +1,8 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.0-k3s2" }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.4-k3s1" }:
 
 buildGoModule rec {
   pname = "kube3d";
-  version = "4.2.0";
+  version = "4.3.0";
 
   excludedPackages = "tools";
 
@@ -10,20 +10,17 @@ buildGoModule rec {
     owner = "rancher";
     repo = "k3d";
     rev = "v${version}";
-    sha256 = "sha256-R2RbQlceOD/uY3IdLLiM23gESh/oWnsiTWxHeH/Si18=";
+    sha256 = "sha256-ybEYKr0rQY8Qg74V1mXqShq5Z2d/Adf0bSSbEMIyo3I=";
   };
 
   vendorSha256 = null;
 
   nativeBuildInputs = [ installShellFiles ];
 
-  buildFlagsArray = [
-    "-ldflags="
-    "-w"
-    "-s"
-    "-X github.com/rancher/k3d/v4/version.Version=v${version}"
-    "-X github.com/rancher/k3d/v4/version.K3sVersion=v${k3sVersion}"
-  ];
+  preBuild = let t = "github.com/rancher/k3d/v4/version"; in
+    ''
+      buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.K3sVersion=v${k3sVersion}")
+    '';
 
   doCheck = false;
 
@@ -36,6 +33,7 @@ buildGoModule rec {
 
   meta = with lib; {
     homepage = "https://github.com/rancher/k3d";
+    changelog = "https://github.com/rancher/k3d/blob/v${version}/CHANGELOG.md";
     description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container - k3d";
     longDescription = ''
       k3s is the lightweight Kubernetes distribution by Rancher: rancher/k3s
@@ -44,7 +42,7 @@ buildGoModule rec {
       multi-node k3s cluster on a single machine using docker.
     '';
     license = licenses.mit;
-    platforms = platforms.linux;
     maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ];
+    platforms = platforms.linux;
   };
 }