Skip to content

fix broken fallback #481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 24, 2023
Merged

fix broken fallback #481

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions module.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ in
{
options.disko = {
extraRootModules = lib.mkOption {
type = lib.types.listOf lib.types.str ;
type = lib.types.listOf lib.types.str;
description = ''
extra modules to pass to the vmTools.runCommand invocation in the make-disk-image.nix builder
'';
default = [];
default = [ ];
};
memSize = lib.mkOption {
type = lib.types.int;
Expand All @@ -34,7 +34,7 @@ in
description = ''
list of extra packages to make available in the make-disk-image.nix VM builder, an example might be f2fs-tools
'';
default = [];
default = [ ];
};
rootMountPoint = lib.mkOption {
type = lib.types.str;
Expand Down Expand Up @@ -90,8 +90,8 @@ in
system.build = (cfg.devices._scripts { inherit pkgs; checked = cfg.checkScripts; }) // {

# we keep these old outputs for compatibility
disko = builtins.trace "the .disko output is deprecated, please use .diskoScript instead" (cfg.devices._scripts pkgs).diskoScript;
diskoNoDeps = builtins.trace "the .diskoNoDeps output is deprecated, please use .diskoScriptNoDeps instead" (cfg.devices._scripts pkgs).diskoScriptNoDeps;
disko = builtins.trace "the .disko output is deprecated, please use .diskoScript instead" (cfg.devices._scripts { inherit pkgs; }).diskoScript;
diskoNoDeps = builtins.trace "the .diskoNoDeps output is deprecated, please use .diskoScriptNoDeps instead" (cfg.devices._scripts { inherit pkgs; }).diskoScriptNoDeps;

diskoImages = diskoLib.makeDiskImages {
nixosConfig = args;
Expand Down