From d5d0f0547d7923398c58c7ace32bfeb6cf6474c8 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 10 May 2022 14:54:07 +0100 Subject: [PATCH] k3d: update pname to k3d --- pkgs/applications/networking/cluster/k3d/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3d/default.nix b/pkgs/applications/networking/cluster/k3d/default.nix index 395010dd4c9a..473a12c4de00 100644 --- a/pkgs/applications/networking/cluster/k3d/default.nix +++ b/pkgs/applications/networking/cluster/k3d/default.nix @@ -14,7 +14,7 @@ let false; in buildGoModule rec { - pname = "kube3d"; + pname = "k3d"; version = "5.4.4"; src = fetchFromGitHub { @@ -30,10 +30,10 @@ buildGoModule rec { excludedPackages = [ "tools" "docgen" ]; ldflags = - let t = "github.com/k3d-io/k3d/v5/version"; in + let t = "github.com/k3d-io/k3d/v${lib.versions.major version}/version"; in [ "-s" "-w" "-X ${t}.Version=v${version}" ] ++ lib.optionals k3sVersionSet [ "-X ${t}.K3sVersion=v${k3sVersion}" ]; - preCheck = '' + preCheck = '' # skip test that uses networking substituteInPlace version/version_test.go \ --replace "TestGetK3sVersion" "SkipGetK3sVersion" @@ -57,7 +57,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/k3d-io/k3d/"; changelog = "https://github.com/k3d-io/k3d/blob/v${version}/CHANGELOG.md"; - description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container - k3d"; + description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container"; longDescription = '' k3s is the lightweight Kubernetes distribution by Rancher: rancher/k3s @@ -67,6 +67,5 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ricochet ]; platforms = platforms.linux ++ platforms.darwin; - mainProgram = "k3d"; }; }