nix-community/disko
1
1
Fork 0
mirror of https://github.com/nix-community/disko.git synced 2024-11-04 05:44:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix broken fallback

Browse Source 
fixes an error when using this minimal configuration:

```nix
let
  pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-23.11") { };
  disko = fetchTarball "https://github.com/nix-community/disko/tarball/master";
in
pkgs.nixos {
  imports = [
    "${disko}/module.nix"
    "${disko}/example/hybrid.nix"
  ];
}
```

when running:

```console
$ nix-build
...
error: 'default' at /nix/store/y981rwszq9yi36rvvz2vrr6hb22si0hc-source/lib/default.nix:391:23 called with unexpected argument 'system'
```
This commit is contained in:
fricklerhandwerk 2023-12-24 17:12:23 +01:00 committed by Jörg Thalheim
parent a050895e4e
commit 2890a8c922
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
module.nix
View File

@ -11,11 +11,11 @@ in
{ {
options.disko = { options.disko = {
extraRootModules = lib.mkOption { extraRootModules = lib.mkOption {
type = lib.types.listOf lib.types.str ; type = lib.types.listOf lib.types.str;
description = '' description = ''
extra modules to pass to the vmTools.runCommand invocation in the make-disk-image.nix builder extra modules to pass to the vmTools.runCommand invocation in the make-disk-image.nix builder
''; '';
default = []; default = [ ];
}; };
memSize = lib.mkOption { memSize = lib.mkOption {
type = lib.types.int; type = lib.types.int;
@ -34,7 +34,7 @@ in
description = '' description = ''
list of extra packages to make available in the make-disk-image.nix VM builder, an example might be f2fs-tools 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 { rootMountPoint = lib.mkOption {
type = lib.types.str; type = lib.types.str;
@ -90,8 +90,8 @@ in
system.build = (cfg.devices._scripts { inherit pkgs; checked = cfg.checkScripts; }) // { system.build = (cfg.devices._scripts { inherit pkgs; checked = cfg.checkScripts; }) // {
# we keep these old outputs for compatibility # we keep these old outputs for compatibility
disko = builtins.trace "the .disko output is deprecated, please use .diskoScript instead" (cfg.devices._scripts pkgs).diskoScript; 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 pkgs).diskoScriptNoDeps; diskoNoDeps = builtins.trace "the .diskoNoDeps output is deprecated, please use .diskoScriptNoDeps instead" (cfg.devices._scripts { inherit pkgs; }).diskoScriptNoDeps;
diskoImages = diskoLib.makeDiskImages { diskoImages = diskoLib.makeDiskImages {
nixosConfig = args; nixosConfig = args;