Compare commits
6 commits
3a108a64b9
...
02d4edb3dc
Author | SHA1 | Date | |
---|---|---|---|
02d4edb3dc | |||
77dac5900f | |||
e5afb75b16 | |||
b029979750 | |||
9034a3b46a | |||
6a9a49ec90 |
7 changed files with 89 additions and 62 deletions
48
flake.lock
48
flake.lock
|
@ -24,11 +24,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728334376,
|
||||
"narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=",
|
||||
"lastModified": 1728902215,
|
||||
"narHash": "sha256-toHnqv0orYpu+/IHN7CgtG4ckCrevY9UxMCAxJJ8MVY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe",
|
||||
"rev": "3b2e19fe7c667a4fb2da3d6bb5ae6ee3e3552f74",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -359,11 +359,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728263287,
|
||||
"narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=",
|
||||
"lastModified": 1728790083,
|
||||
"narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259",
|
||||
"rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -403,11 +403,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728438322,
|
||||
"narHash": "sha256-vVMMJaoYGjrsXzUzXCsoF5cbqq3aV44RHIoQPxzLAGs=",
|
||||
"lastModified": 1728784327,
|
||||
"narHash": "sha256-Ib1rAnxE4ZZtO3WE7E4+mwivz37gwNOW5qPToJb9RPQ=",
|
||||
"owner": "Infinidoge",
|
||||
"repo": "nix-minecraft",
|
||||
"rev": "6f3e79295e2ded5f13076fa99cec6abf59a8d9fe",
|
||||
"rev": "14f679c6eaba1ef43b6f6092ba82e24cba97c858",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -440,11 +440,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1728269138,
|
||||
"narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=",
|
||||
"lastModified": 1728729581,
|
||||
"narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b",
|
||||
"rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -456,11 +456,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1728328465,
|
||||
"narHash": "sha256-a0a0M1TmXMK34y3M0cugsmpJ4FJPT/xsblhpiiX1CXo=",
|
||||
"lastModified": 1728740863,
|
||||
"narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1bfbbbe5bbf888d675397c66bfdb275d0b99361c",
|
||||
"rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -516,11 +516,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1728241625,
|
||||
"narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
|
||||
"lastModified": 1728492678,
|
||||
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
|
||||
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -568,11 +568,11 @@
|
|||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1728490142,
|
||||
"narHash": "sha256-5iIn7eiCYNq9eWhUAiXDHd3vkA4UCCruU9BEOP3FzfA=",
|
||||
"lastModified": 1728913253,
|
||||
"narHash": "sha256-knJQYHo54jhS9IprmzrZV5dMVFYcm3iP1JxDRyDnnkQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "2a8c9d69e204ac6991449a12d69f748f60bb794c",
|
||||
"rev": "0d5f98994e1f8f94bfe7d54c4f6d0e343bf908d8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -830,11 +830,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728466207,
|
||||
"narHash": "sha256-CoJZYeo6SJMpf/FpIcGjSuQjHzzzgLSEvkrSqwbv4WA=",
|
||||
"lastModified": 1728896766,
|
||||
"narHash": "sha256-1mCDMjzge38cwdg7HgiBcnVT1GNm9n72qetyWqAFKPM=",
|
||||
"owner": "budimanjojo",
|
||||
"repo": "talhelper",
|
||||
"rev": "2f8ce1a683ca8be32af0b64d78295a498fb10737",
|
||||
"rev": "fb6f7a85f374f0ed597bf0fcd8d68b43ed2a4134",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -53,7 +53,7 @@ with config;
|
|||
unstable.jetbrains.rust-rover
|
||||
unstable.peazip
|
||||
unstable.seabird
|
||||
unstable.talosctl
|
||||
unstable.talosctl # overlay override
|
||||
unstable.telegram-desktop
|
||||
unstable.tidal-hifi
|
||||
# unstable.vesktop # gpu issues. Using the flatpak version solves this issue.
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
imports = [
|
||||
./backrest
|
||||
./lego-auto
|
||||
./unifi
|
||||
./scrutiny
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,42 +1,33 @@
|
|||
{ inputs, ... }:
|
||||
let
|
||||
inherit (inputs.nixpkgs) lib;
|
||||
|
||||
vivaldiOverlay = self: super: {
|
||||
vivaldi = super.callPackage ./vivaldi { };
|
||||
};
|
||||
|
||||
termiusOverlay = self: super: {
|
||||
termius = super.callPackage ./termius { };
|
||||
};
|
||||
|
||||
modsOverlay = self: super: {
|
||||
mods = super.callPackage ./charm-mods { };
|
||||
};
|
||||
|
||||
coderOverlay = self: super: {
|
||||
coder = super.callPackage ./coder { };
|
||||
};
|
||||
|
||||
smartmontoolsOverlay = import ./smartmontools { };
|
||||
# smartmontoolsOverlay = import ./smartmontools { };
|
||||
# vivaldiOverlay = self: super: { vivaldi = super.callPackage ./vivaldi { }; };
|
||||
coderOverlay = self: super: { coder = super.callPackage ./coder { }; };
|
||||
modsOverlay = self: super: { mods = super.callPackage ./charm-mods { }; };
|
||||
termiusOverlay = self: super: { termius = super.callPackage ./termius { }; };
|
||||
in
|
||||
{
|
||||
# smartmontools = smartmontoolsOverlay;
|
||||
# vivaldi = vivaldiOverlay;
|
||||
coder = coderOverlay;
|
||||
comm-packages = inputs.nix-vscode-extensions.overlays.default;
|
||||
mods = modsOverlay;
|
||||
nur = inputs.nur.overlay;
|
||||
# smartmontools = smartmontoolsOverlay;
|
||||
termius = termiusOverlay;
|
||||
# vivaldi = vivaldiOverlay;
|
||||
nix-minecraft = inputs.nix-minecraft.overlay;
|
||||
nur = inputs.nur.overlay;
|
||||
termius = termiusOverlay;
|
||||
|
||||
# The unstable nixpkgs set (declared in the flake inputs) will
|
||||
# be accessible through 'pkgs.unstable'
|
||||
unstable-packages = final: _prev: {
|
||||
unstable = import inputs.nixpkgs-unstable {
|
||||
inherit (final) system;
|
||||
config.allowUnfree = true;
|
||||
unstable-packages = final: prev: {
|
||||
unstable = import inputs.nixpkgs-unstable
|
||||
{
|
||||
inherit (final) system;
|
||||
config.allowUnfree = true;
|
||||
} // {
|
||||
# Add talosctl to the unstable set
|
||||
talosctl = final.unstable.callPackage ./talosctl/talosctl-full.nix {
|
||||
inherit (final.unstable) lib buildGoModule fetchFromGitHub installShellFiles;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -1,19 +1,16 @@
|
|||
{ ... }:
|
||||
let
|
||||
finalVersion = "1.7.5";
|
||||
finalVersion = "1.8.1";
|
||||
in
|
||||
final: prev: {
|
||||
talosctl = prev.talosctl.overrideAttrs (oldAttrs: {
|
||||
talosctl = prev.talosctl.overrideAttrs (oldAttrs: {
|
||||
version = finalVersion;
|
||||
src = prev.fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "talos";
|
||||
rev = "v${finalVersion}";
|
||||
hash = "sha256-lmDLlxiPyVhlSPplYkIaS5Uw19hir6XD8MAk8q+obhY=";
|
||||
};
|
||||
vendorHash = "sha256-8UIey+r1tdVRN1RBK5xxcAzaHb0VFdgenUXSFgoWh1g=";
|
||||
passthru = oldAttrs.passthru // {
|
||||
updateScript = ./update.sh;
|
||||
hash = "sha256-6WHeiVH/vZHiM4bqq3T5lC0ARldJyZtIErPeDgrZgxc=";
|
||||
};
|
||||
vendorHash = "sha256-aTtvVpL979BUvSBwBqRqCWSWIBBmmty9vBD97Q5P4+E=";
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
40
nixos/overlays/talosctl/talosctl-full.nix
Normal file
40
nixos/overlays/talosctl/talosctl-full.nix
Normal 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 ];
|
||||
};
|
||||
}
|
Loading…
Reference in a new issue