nix-community/disko
1
0
Fork 0
mirror of https://github.com/nix-community/disko.git synced 2026-01-14 10:18:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #906 from nix-community/fix-904

Browse source 
make-disk-image: Compare against correct nixpkgs version
This commit is contained in:
Jörg Thalheim 2024-11-29 23:29:22 +01:00 • committed by GitHub
commit b71e3faca9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/default.nix
View file

@ -361,10 +361,11 @@ let
/* Checks whether nixpkgs is recent enough for vmTools to support the customQemu argument.
Returns false, which is technically incorrect, for a few commits on 2024-07-08, but we can't be more accurate.
Make sure to pass lib, not pkgs.lib! See https://github.com/nix-community/disko/issues/904
vmToolsSupportsCustomQemu :: pkgs -> bool
vmToolsSupportsCustomQemu :: final_lib -> bool
*/
vmToolsSupportsCustomQemu = pkgs: lib.versionAtLeast pkgs.lib.version "24.11.20240709";
vmToolsSupportsCustomQemu = final_lib: lib.versionAtLeast final_lib.version "24.11.20240709";
optionTypes = rec {
filename = lib.mkOptionType {

2
lib/make-disk-image.nix
View file

@ -21,7 +21,7 @@ let
(with cfg.kernelPackages; [ kernel ]
++ lib.optional (lib.elem "zfs" cfg.extraRootModules || configSupportsZfs) zfs);
}
// lib.optionalAttrs (diskoLib.vmToolsSupportsCustomQemu pkgs)
// lib.optionalAttrs (diskoLib.vmToolsSupportsCustomQemu lib)
{
customQemu = cfg.qemu;
};

2
module.nix
View file

@ -213,7 +213,7 @@ in
config = {
assertions = [
{
assertion = config.disko.imageBuilder.qemu != null -> diskoLib.vmToolsSupportsCustomQemu pkgs;
assertion = config.disko.imageBuilder.qemu != null -> diskoLib.vmToolsSupportsCustomQemu lib;
message = ''
You have set config.disko.imageBuild.qemu, but vmTools in your nixpkgs version "${lib.version}"
does not support overriding the qemu package with the customQemu option yet.