0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-04-24 06:05:30 +00:00 committed by GitHub
commit d8d6ba0d2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 453 additions and 127 deletions

View file

@ -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.
'';

View file

@ -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.
'';

View file

@ -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.
'';

View file

@ -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.
'';

View file

@ -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.
'';

View file

@ -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.
'';