diff options
| author | Luke Granger-Brown <git@lukegb.com> | 2021-04-24 02:38:36 +0000 |
|---|---|---|
| committer | Luke Granger-Brown <git@lukegb.com> | 2021-04-24 02:38:36 +0000 |
| commit | 4fb91cbafe6fd51d2c23bb15e0d5aae61143b6a9 (patch) | |
| tree | 3d74e65641af7f18140452cbc72def8f15fde0e2 /nixos/modules | |
| parent | f521b12b0ed0a5ec96153542bea5705cb1a2b470 (diff) | |
| download | nixpkgs-4fb91cbafe6fd51d2c23bb15e0d5aae61143b6a9.tar nixpkgs-4fb91cbafe6fd51d2c23bb15e0d5aae61143b6a9.tar.gz nixpkgs-4fb91cbafe6fd51d2c23bb15e0d5aae61143b6a9.tar.bz2 nixpkgs-4fb91cbafe6fd51d2c23bb15e0d5aae61143b6a9.tar.lz nixpkgs-4fb91cbafe6fd51d2c23bb15e0d5aae61143b6a9.tar.xz nixpkgs-4fb91cbafe6fd51d2c23bb15e0d5aae61143b6a9.tar.zst nixpkgs-4fb91cbafe6fd51d2c23bb15e0d5aae61143b6a9.zip | |
Revert "treewide: use auto diskSize for make-disk-image"
This reverts commit f3aa040bcbf39935e7e9ac7a7296eac9da7623ec.
Diffstat (limited to 'nixos/modules')
6 files changed, 12 insertions, 18 deletions
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index 03dd3c05130..60fed3222ef 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -9,9 +9,8 @@ in options = { virtualisation.azureImage.diskSize = mkOption { - type = with types; either (enum [ "auto" ]) int; - default = "auto"; - example = 2048; + type = with types; int; + default = 2048; description = '' Size of disk image. Unit is MB. ''; diff --git a/nixos/modules/virtualisation/digital-ocean-image.nix b/nixos/modules/virtualisation/digital-ocean-image.nix index 0ff2ee591f2..b582e235d43 100644 --- a/nixos/modules/virtualisation/digital-ocean-image.nix +++ b/nixos/modules/virtualisation/digital-ocean-image.nix @@ -10,9 +10,8 @@ in options = { virtualisation.digitalOceanImage.diskSize = mkOption { - type = with types; either (enum [ "auto" ]) int; - default = "auto"; - example = 4096; + type = with types; int; + default = 4096; description = '' Size of disk image. Unit is MB. ''; diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 79c3921669e..e2332df611a 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -18,9 +18,8 @@ in options = { virtualisation.googleComputeImage.diskSize = mkOption { - type = with types; either (enum [ "auto" ]) int; - default = "auto"; - example = 1536; + type = with types; int; + default = 1536; description = '' Size of disk image. Unit is MB. ''; diff --git a/nixos/modules/virtualisation/hyperv-image.nix b/nixos/modules/virtualisation/hyperv-image.nix index 6845d675009..fabc9113dfc 100644 --- a/nixos/modules/virtualisation/hyperv-image.nix +++ b/nixos/modules/virtualisation/hyperv-image.nix @@ -9,9 +9,8 @@ in { options = { hyperv = { baseImageSize = mkOption { - type = with types; either (enum [ "auto" ]) int; - default = "auto"; - example = 2048; + type = types.int; + default = 2048; description = '' The size of the hyper-v base image in MiB. ''; diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 071edda8269..fa580e8b42d 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -11,9 +11,8 @@ in { options = { virtualbox = { baseImageSize = mkOption { - type = with types; either (enum [ "auto" ]) int; - default = "auto"; - example = 50 * 1024; + type = types.int; + default = 50 * 1024; description = '' The size of the VirtualBox base image in MiB. ''; diff --git a/nixos/modules/virtualisation/vmware-image.nix b/nixos/modules/virtualisation/vmware-image.nix index f6cd12e2bb7..9da9e145f7a 100644 --- a/nixos/modules/virtualisation/vmware-image.nix +++ b/nixos/modules/virtualisation/vmware-image.nix @@ -18,9 +18,8 @@ in { options = { vmware = { baseImageSize = mkOption { - type = with types; either (enum [ "auto" ]) int; - default = "auto"; - example = 2048; + type = types.int; + default = 2048; description = '' The size of the VMWare base image in MiB. ''; |