Full talosctl overlay for 1.7.5 and partial go 1.22.4
All checks were successful
Build / nix-build (native-x86_64, legiondary) (pull_request) Successful in 10m27s
Build / nix-build (native-aarch64, varda) (pull_request) Successful in 11m33s

This commit is contained in:
Joseph Hanson 2024-07-04 03:33:02 -05:00
parent 638efe918e
commit 9e0def2655
Signed by: jahanson
SSH key fingerprint: SHA256:vy6dKBECV522aPAwklFM3ReKAVB086rT3oWwiuiFG7o
7 changed files with 56 additions and 7 deletions

View file

@ -33,7 +33,7 @@ with config;
termius
obsidian
jetbrains.datagrip
# talosctl
talosctl
# cli
brightnessctl

View file

@ -4,15 +4,20 @@ let
inherit (inputs.nixpkgs) lib;
};
termiusOverlay = import ./termius { };
talosctlOverlay = import ./talosctl { };
# Partial overlay
# talosctlOverlay = import ./talosctl { };
# Full overlay
talosctlOverlay = self: super: {
talosctl = super.callPackage ./talosctl/talosctl-custom.nix { };
};
goOverlay = import ./go { };
in
{
nur = inputs.nur.overlay;
warp-terminal = warpTerminalOverlay;
termius = termiusOverlay;
# talosctl = talosctlOverlay;
# go = goOverlay;
talosctl = talosctlOverlay;
go = goOverlay;
# The unstable nixpkgs set (declared in the flake inputs) will
# be accessible through 'pkgs.unstable'

View file

@ -3,7 +3,7 @@ let
finalVersion = "1.22.4";
in
(final: prev: {
go = prev.go.overrideAttrs (oldAttrs: {
go_1_22 = prev.go_1_22.overrideAttrs (oldAttrs: {
version = finalVersion;
src = prev.fetchurl {
url = "https://go.dev/dl/go${finalVersion}.src.tar.gz";

View file

@ -11,6 +11,7 @@ in
rev = "v${finalVersion}";
hash = "sha256-lmDLlxiPyVhlSPplYkIaS5Uw19hir6XD8MAk8q+obhY=";
};
vendorHash = "sha256-8UIey+r1tdVRN1RBK5xxcAzaHb0VFdgenUXSFgoWh1g=";
passthru = oldAttrs.passthru // {
updateScript = ./update.sh;
};

View file

@ -0,0 +1,43 @@
{ lib, buildGo122Module, fetchFromGitHub, installShellFiles }:
buildGo122Module rec {
pname = "talosctl";
version = "1.7.5";
src = fetchFromGitHub {
owner = "siderolabs";
repo = "talos";
rev = "v${version}";
hash = "sha256-lmDLlxiPyVhlSPplYkIaS5Uw19hir6XD8MAk8q+obhY=";
};
passthru = {
updateScript = ./update.sh;
};
vendorHash = "sha256-8UIey+r1tdVRN1RBK5xxcAzaHb0VFdgenUXSFgoWh1g=";
ldflags = [ "-s" "-w" ];
env.GOWORK = "off";
subPackages = [ "cmd/talosctl" ];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion --cmd talosctl \
--bash <($out/bin/talosctl completion bash) \
--fish <($out/bin/talosctl completion fish) \
--zsh <($out/bin/talosctl completion zsh)
'';
doCheck = false; # no tests
meta = with lib; {
description = "CLI for out-of-band management of Kubernetes nodes created by Talos";
mainProgram = "talosctl";
homepage = "https://www.talos.dev/";
license = licenses.mpl20;
maintainers = with maintainers; [ flokli ];
};
}

View file

@ -18,6 +18,7 @@ with config;
nixpkgs-fmt
statix
gh
go
# bind # for dns utils like named-checkconf
inputs.nix-inspect.packages.${pkgs.system}.default

View file

@ -17,7 +17,6 @@ pkgs.mkShell {
NIX_CONFIG = "experimental-features = nix-command flakes";
nativeBuildInputs = with pkgs; [
buildPackages.go_1_22
nix
home-manager
git