From 7fdfe7ffea2916e3f6c7749da76ad10149bdf482 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 9 Apr 2022 13:29:31 +1000 Subject: [PATCH] talosctl: update ldflags - https://github.com/siderolabs/talos/blob/v1.0.1/Makefile - add/update ldflags from makefile - also update src.owner and homepage --- .../networking/cluster/talosctl/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 7e12f18a78c5..c04785027ca4 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { # nixpkgs-update: no auto update src = fetchFromGitHub { - owner = "talos-systems"; + owner = "siderolabs"; repo = "talos"; rev = "v${version}"; inherit sha256; @@ -26,14 +26,16 @@ buildGoModule rec { mgmtHelpersPkg = "github.com/talos-systems/talos/cmd/talosctl/pkg/mgmt/helpers"; #MGMT_HELPERS_PKG in [ - "-X ${versionPkg}.Name=Talos" + "-X ${versionPkg}.Name=Client" "-X ${versionPkg}.SHA=${src.rev}" # should be the hash, but as we build from tags, this needs to do "-X ${versionPkg}.Tag=${src.rev}" "-X ${versionPkg}.PkgsVersion=${pkgsVersion}" # PKGS "-X ${versionPkg}.ExtrasVersion=${extrasVersion}" # EXTRAS - "-X ${imagesPkgs}.Username=talos-systems" # USERNAME + "-X ${imagesPkgs}.Username=siderolabs" # USERNAME "-X ${imagesPkgs}.Registry=ghcr.io" # REGISTRY "-X ${mgmtHelpersPkg}.ArtifactsPath=_out" # ARTIFACTS + "-s" + "-w" ]; subPackages = [ "cmd/talosctl" ]; @@ -51,7 +53,7 @@ buildGoModule rec { meta = with lib; { description = "A CLI for out-of-band management of Kubernetes nodes created by Talos"; - homepage = "https://github.com/talos-systems/talos"; + homepage = "https://www.talos.dev/"; license = licenses.mpl20; maintainers = with maintainers; [ flokli ]; };