Compare commits

..

No commits in common. "fb2a0df0a8d8d22e51bad04f6242cafa27060b57" and "d5d2a7c88851afdb5ad5256df1f6d24c607c7273" have entirely different histories.

5 changed files with 99 additions and 50 deletions

View file

@ -1,10 +0,0 @@
{ ... }:
let
finalVersion = "tauri-v2.0.4";
in
final: prev: {
cargo-tauri = prev.cargo-tauri.overrideAttrs (oldAttrs: {
version = finalVersion;
vendorHash = "sha256-aTtvVpL979BUvSBwBqRqCWSWIBBmmty9vBD97Q5P4+E=";
});
}

View file

@ -25,7 +25,7 @@ in
config.allowUnfree = true; config.allowUnfree = true;
} // { } // {
# Add talosctl to the unstable set # Add talosctl to the unstable set
talosctl = final.unstable.callPackage ./talosctl { talosctl = final.unstable.callPackage ./talosctl/talosctl-full.nix {
inherit (final.unstable) lib buildGoModule fetchFromGitHub installShellFiles; inherit (final.unstable) lib buildGoModule fetchFromGitHub installShellFiles;
}; };
}; };

View file

@ -1,40 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: { ... }:
let
buildGoModule rec { finalVersion = "1.8.1";
pname = "talosctl"; in
version = "1.8.1"; final: prev: {
talosctl = prev.talosctl.overrideAttrs (oldAttrs: {
src = fetchFromGitHub { version = finalVersion;
owner = "siderolabs"; src = prev.fetchFromGitHub {
repo = "talos"; owner = "siderolabs";
rev = "v${version}"; repo = "talos";
hash = "sha256-6WHeiVH/vZHiM4bqq3T5lC0ARldJyZtIErPeDgrZgxc="; rev = "v${finalVersion}";
}; hash = "sha256-6WHeiVH/vZHiM4bqq3T5lC0ARldJyZtIErPeDgrZgxc=";
};
vendorHash = "sha256-aTtvVpL979BUvSBwBqRqCWSWIBBmmty9vBD97Q5P4+E="; vendorHash = "sha256-aTtvVpL979BUvSBwBqRqCWSWIBBmmty9vBD97Q5P4+E=";
});
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

@ -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

@ -0,0 +1,40 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "talosctl";
version = "1.8.1";
src = fetchFromGitHub {
owner = "siderolabs";
repo = "talos";
rev = "v${version}";
hash = "sha256-6WHeiVH/vZHiM4bqq3T5lC0ARldJyZtIErPeDgrZgxc=";
};
vendorHash = "sha256-aTtvVpL979BUvSBwBqRqCWSWIBBmmty9vBD97Q5P4+E=";
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 ];
};
}