From 302d53df2b79f48ea6e9f42e47dd17e561ff6433 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Tue, 25 Dec 2018 18:58:04 -0500 Subject: [PATCH] nixos/sd-image-aarch64-new-kernel: Added to release This, paired with the previous commit, ensures the channel won't be held back from a kernel upgrade and a non-building sd image, while still having a new-kernel variant available. --- .../installer/cd-dvd/sd-image-aarch64-new-kernel.nix | 7 +++++++ nixos/release.nix | 8 ++++++++ 2 files changed, 15 insertions(+) create mode 100644 nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix new file mode 100644 index 000000000000..2882fbcc7305 --- /dev/null +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: + +{ + imports = [ ./sd-image-aarch64.nix ]; + + boot.kernelPackages = pkgs.linuxPackages_latest; +} diff --git a/nixos/release.nix b/nixos/release.nix index e7952b33de6b..df2c52ccd0b6 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -172,6 +172,14 @@ in rec { inherit system; }); + sd_image_new_kernel = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage { + module = { + aarch64-linux = ./modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix; + }.${system}; + type = "minimal-new-kernel"; + inherit system; + }); + # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF). ova = forMatchingSystems [ "x86_64-linux" ] (system: