Merge pull request #232 from nix-community/update-nixos-24.05

ci: fixup attribute names
This commit is contained in:
Jörg Thalheim 2024-06-07 14:09:26 +02:00 committed by GitHub
commit f267906ba6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -6,7 +6,7 @@ shopt -s lastpipe
build_netboot_image() { build_netboot_image() {
declare -r tag=$1 channel=$2 arch=$3 tmp=$4 declare -r tag=$1 channel=$2 arch=$3 tmp=$4
img=$(nix build --print-out-paths --option accept-flake-config true -L ".#packages.${arch}.netboot-${channel//./}") img=$(nix build --print-out-paths --option accept-flake-config true -L ".#packages.${arch}.netboot-nixos-${channel//./}")
kernel=$(echo "$img"/*Image) kernel=$(echo "$img"/*Image)
kernelName=$(basename "$kernel") kernelName=$(basename "$kernel")
ln -s "$kernel" "$tmp/$kernelName-$arch" ln -s "$kernel" "$tmp/$kernelName-$arch"
@ -23,13 +23,13 @@ build_netboot_image() {
build_kexec_installer() { build_kexec_installer() {
declare -r channel=$1 arch=$2 tmp=$3 variant=$4 declare -r channel=$1 arch=$2 tmp=$3 variant=$4
out=$(nix build --print-out-paths --option accept-flake-config true -L ".#packages.${arch}.kexec-installer-${channel}${variant}") out=$(nix build --print-out-paths --option accept-flake-config true -L ".#packages.${arch}.kexec-installer-nixos-${channel}${variant}")
echo "$out/nixos-kexec-installer${variant}-$arch.tar.gz" echo "$out/nixos-kexec-installer${variant}-$arch.tar.gz"
} }
build_image_installer() { build_image_installer() {
declare -r channel=$1 arch=$2 tmp=$3 declare -r channel=$1 arch=$2 tmp=$3
out=$(nix build --print-out-paths --option accept-flake-config true -L ".#packages.${arch}.image-installer-${channel//./}") out=$(nix build --print-out-paths --option accept-flake-config true -L ".#packages.${arch}.image-installer-nixos-${channel//./}")
echo "$out/iso/nixos-installer-${arch}.iso" echo "$out/iso/nixos-installer-${arch}.iso"
} }