summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author06kellyjac <dev@j-k.io>2020-11-17 22:53:44 +0000
committer06kellyjac <dev@j-k.io>2020-11-26 12:37:37 +0000
commitcdfa9b0c26184fc6850a5f27ab14514427f3a87a (patch)
tree9845fbab534fb778d1f143aa8061ee9635e0e450
parent168df5f4ffab1ad33e4a953712ce001aeed5ee94 (diff)
kube3d: re-order the derivation and general cleanup
Moved k3sVersion to be a variable. Converted buildFlagsArray to an array Moved vendorSha256 closer to src Moved doCheck between build and install related bits (like where the phase happens) Replaced stdenv.lib with lib
-rw-r--r--pkgs/applications/networking/cluster/kube3d/default.nix31
1 files changed, 17 insertions, 14 deletions
diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index 31b23159054f..9163347d7b22 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
+let
+ k3sVersion = "1.19.3-k3s3";
+in
buildGoModule rec {
pname = "kube3d";
version = "3.3.0";
- k3sVersion = "1.19.3-k3s3";
- excludedPackages = ''tools'';
+ excludedPackages = "tools";
src = fetchFromGitHub {
owner = "rancher";
@@ -14,15 +16,20 @@ buildGoModule rec {
sha256 = "1pq5x4fyn98f01mzfjv335gx29c61zd85qc5vhx9rk27hi825ima";
};
- buildFlagsArray = ''
- -ldflags=
- -w -s
- -X github.com/rancher/k3d/v3/version.Version=v${version}
- -X github.com/rancher/k3d/v3/version.K3sVersion=v${k3sVersion}
- '';
+ vendorSha256 = null;
nativeBuildInputs = [ installShellFiles ];
+ buildFlagsArray = [
+ "-ldflags="
+ "-w"
+ "-s"
+ "-X github.com/rancher/k3d/v3/version.Version=v${version}"
+ "-X github.com/rancher/k3d/v3/version.K3sVersion=v${k3sVersion}"
+ ];
+
+ doCheck = false;
+
postInstall = ''
installShellCompletion --cmd k3d \
--bash <($out/bin/k3d completion bash) \
@@ -30,11 +37,7 @@ buildGoModule rec {
--zsh <($out/bin/k3d completion zsh)
'';
- vendorSha256 = null;
-
- doCheck = false;
-
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = "https://github.com/rancher/k3d";
description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container - k3d";
longDescription = ''