Fix building the hydra vm ISO.

This commit is contained in:
Tom Alexander 2025-09-27 17:58:59 -04:00
parent fe49204e3f
commit ad2c4809d7
Signed by: talexander
GPG Key ID: 36C99E8B3C39D85F
4 changed files with 33 additions and 4 deletions

View File

@ -193,7 +193,7 @@
};
hydra =
let
additional_iso_modules = additional_iso_modules ++ [
hydra_additional_iso_modules = additional_iso_modules ++ [
{
me.optimizations.enable = true;
}
@ -206,13 +206,13 @@
];
};
iso = main // {
modules = main.modules ++ additional_iso_modules;
modules = main.modules ++ hydra_additional_iso_modules;
};
vm = main // {
modules = main.modules ++ additional_vm_modules;
};
vm_iso = main // {
modules = main.modules ++ additional_vm_modules ++ additional_iso_modules;
modules = main.modules ++ additional_vm_modules ++ hydra_additional_iso_modules;
};
};
ionlybootzfs = rec {

View File

@ -0,0 +1,15 @@
#!/usr/bin/env bash
#
set -euo pipefail
IFS=$'\n\t'
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
: "${JOBS:="1"}"
nix flake update zsh-histdb --flake "$DIR/../../"
nix flake update ansible-sshjail --flake "$DIR/../../"
for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#vm_iso.hydra" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
install -m 0644 result/iso/nixos-*-x86_64-linux.iso ~/hydra.iso
unlink ./result

View File

@ -24,7 +24,6 @@
imports = [
./disk-config.nix
./hardware-configuration.nix
./optimized_build.nix
./vm_disk.nix
];

View File

@ -114,4 +114,19 @@
# })
# ];
# nixpkgs.overlays = [
# (final: prev: {
# linux-firmware = prev.linux-firwmare.overrideAttrs (old: rec {
# version = "20250917";
# src = final.fetchFromGitLab {
# owner = "kernel-firmware";
# repo = "linux-firmware";
# tag = version;
# hash = "sha256-tecFB6WYEfBK9FB7Rv8nHLdefIoaFnHrpzXBl+iSd08=";
# };
# });
# })
# ];
}