jahanson/mochi
1
0
Fork 0
Code Issues 1 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Update talosctl to v1.8.1. Making overlay default.nix a bit more readable.

Browse source
This commit is contained in:
Joseph Hanson 2024-10-11 12:12:09 -05:00
parent db4527f078
commit 6a9a49ec90
Signed by: jahanson
SSH key fingerprint: SHA256:vy6dKBECV522aPAwklFM3ReKAVB086rT3oWwiuiFG7o
2 changed files with 16 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
nixos/overlays/default.nix
View file

@ -1,34 +1,23 @@
{ inputs, ... }: { inputs, ... }:
let let
inherit (inputs.nixpkgs) lib; inherit (inputs.nixpkgs) lib;
# smartmontoolsOverlay = import ./smartmontools { };
vivaldiOverlay = self: super: { # vivaldiOverlay = self: super: { vivaldi = super.callPackage ./vivaldi { }; };
vivaldi = super.callPackage ./vivaldi { }; coderOverlay = self: super: { coder = super.callPackage ./coder { }; };
}; modsOverlay = self: super: { mods = super.callPackage ./charm-mods { }; };
talosctlOverlay = import ./talosctl { };
termiusOverlay = self: super: { termiusOverlay = self: super: { termius = super.callPackage ./termius { }; };
termius = super.callPackage ./termius { };
};
modsOverlay = self: super: {
mods = super.callPackage ./charm-mods { };
};
coderOverlay = self: super: {
coder = super.callPackage ./coder { };
};
smartmontoolsOverlay = import ./smartmontools { };
in in
{ {
# smartmontools = smartmontoolsOverlay;
# vivaldi = vivaldiOverlay;
coder = coderOverlay; coder = coderOverlay;
comm-packages = inputs.nix-vscode-extensions.overlays.default; comm-packages = inputs.nix-vscode-extensions.overlays.default;
mods = modsOverlay; mods = modsOverlay;
nur = inputs.nur.overlay;
# smartmontools = smartmontoolsOverlay;
termius = termiusOverlay;
# vivaldi = vivaldiOverlay;
nix-minecraft = inputs.nix-minecraft.overlay; nix-minecraft = inputs.nix-minecraft.overlay;
nur = inputs.nur.overlay;
talosctl = talosctlOverlay;
termius = termiusOverlay;
# The unstable nixpkgs set (declared in the flake inputs) will # The unstable nixpkgs set (declared in the flake inputs) will
# be accessible through 'pkgs.unstable' # be accessible through 'pkgs.unstable'
@ -38,5 +27,4 @@ in
config.allowUnfree = true; config.allowUnfree = true;
}; };
}; };
} }

13
nixos/overlays/talosctl/default.nix
View file

@ -1,19 +1,16 @@
{ ... }: { ... }:
let let
finalVersion = "1.7.5"; finalVersion = "1.8.1";
in in
final: prev: { final: prev: {
talosctl = prev.talosctl.overrideAttrs (oldAttrs: { talosctl = prev.talosctl.overrideAttrs (oldAttrs: {
version = finalVersion; version = finalVersion;
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {
owner = "siderolabs"; owner = "siderolabs";
repo = "talos"; repo = "talos";
rev = "v${finalVersion}"; rev = "v${finalVersion}";
hash = "sha256-lmDLlxiPyVhlSPplYkIaS5Uw19hir6XD8MAk8q+obhY="; hash = "sha256-6WHeiVH/vZHiM4bqq3T5lC0ARldJyZtIErPeDgrZgxc=";
};
vendorHash = "sha256-8UIey+r1tdVRN1RBK5xxcAzaHb0VFdgenUXSFgoWh1g=";
passthru = oldAttrs.passthru // {
updateScript = ./update.sh;
}; };
vendorHash = "sha256-aTtvVpL979BUvSBwBqRqCWSWIBBmmty9vBD97Q5P4+E=";
}); });
} }