cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #178534 from qowoz/talosctl110

Browse source 
talosctl: 1.0.6 -> 1.1.0
This commit is contained in:
Florian Klink 2022-06-24 19:25:11 +07:00 committed by GitHub
commit 7f8734e9b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
pkgs/applications/networking/cluster/talosctl/default.nix
View file

@ -1,42 +1,21 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: { lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
let
# look for GO_LDFLAGS getting set in the Makefile
version = "1.0.6";
sha256 = "sha256-4cUaQWqVndp06eFgqInOMMGITbTdZO5BOqXW2XEpuWU=";
vendorSha256 = "sha256-7q35d+jbIDe7fAy6nL5FWdSovBb/f64HYLHGL+zE6bI=";
pkgsVersion = "v1.0.0-25-gcf9709e";
extrasVersion = "v1.0.0-4-g05b0920";
in
buildGoModule rec { buildGoModule rec {
pname = "talosctl"; pname = "talosctl";
inherit version vendorSha256; version = "1.1.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "siderolabs"; owner = "siderolabs";
repo = "talos"; repo = "talos";
rev = "v${version}"; rev = "v${version}";
inherit sha256; sha256 = "sha256-52WzQ5LWgIX/XBJPNvWV0tAPnw1AiINDL/7D3UYvvn4=";
}; };
ldflags = vendorSha256 = "sha256-iluI4UGw5cZ70wmC9jDiGttvxZ7xFyqcL9IZX4ubJqs=";
let
versionPkg = "github.com/talos-systems/talos/pkg/version"; # VERSION_PKG ldflags = [ "-s" "-w" ];
imagesPkgs = "github.com/talos-systems/talos/pkg/images"; # IMAGES_PKGS
mgmtHelpersPkg = "github.com/talos-systems/talos/cmd/talosctl/pkg/mgmt/helpers"; #MGMT_HELPERS_PKG GOWORK = "off";
in
[
"-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=siderolabs" # USERNAME
"-X ${imagesPkgs}.Registry=ghcr.io" # REGISTRY
"-X ${mgmtHelpersPkg}.ArtifactsPath=_out" # ARTIFACTS
"-s"
"-w"
];
subPackages = [ "cmd/talosctl" ]; subPackages = [ "cmd/talosctl" ];
@ -56,5 +35,8 @@ buildGoModule rec {
homepage = "https://www.talos.dev/"; homepage = "https://www.talos.dev/";
license = licenses.mpl20; license = licenses.mpl20;
maintainers = with maintainers; [ flokli ]; maintainers = with maintainers; [ flokli ];
# requires >= 10.14 SDK https://github.com/NixOS/nixpkgs/issues/101229
# Undefined symbols for architecture x86_64: "_SecTrustEvaluateWithError"
broken = stdenv.isDarwin && stdenv.isx86_64;
}; };
} }

4
pkgs/top-level/all-packages.nix
View file

@ -30063,7 +30063,9 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };
talosctl = callPackage ../applications/networking/cluster/talosctl { }; talosctl = callPackage ../applications/networking/cluster/talosctl {
buildGoModule = buildGo118Module;
};
talentedhack = callPackage ../applications/audio/talentedhack { }; talentedhack = callPackage ../applications/audio/talentedhack { };