git.iko.soy/typeable/nixpkgs
on master help sign in
Revert "treewide: use auto diskSize for make-disk-image"
4fb91cbLuke Granger-Brown
nixos/maintainers/scripts/cloudstack/cloudstack-image.nix+1
compare with master
unifiedsplit
@@ -10,6 +10,7 @@ with lib;
10
10
11 system.build.cloudstackImage = import ../../../lib/make-disk-image.nix {
11 system.build.cloudstackImage = import ../../../lib/make-disk-image.nix {
12 inherit lib config pkgs;
12 inherit lib config pkgs;
13+ diskSize = 8192;
13 format = "qcow2";
14 format = "qcow2";
14 configFile = pkgs.writeText "configuration.nix"
15 configFile = pkgs.writeText "configuration.nix"
15 ''
16 ''
nixos/maintainers/scripts/ec2/amazon-image.nix+2−3
@@ -40,9 +40,8 @@ in {
40 };
40 };
41
41
42 sizeMB = mkOption {
42 sizeMB = mkOption {
43− type = with types; either (enum [ "auto" ]) int;
43+ type = types.int;
44− default = "auto";
44+ default = if config.ec2.hvm then 2048 else 8192;
45− example = 8192;
46 description = "The size in MB of the image";
45 description = "The size in MB of the image";
47 };
46 };
48
47
nixos/maintainers/scripts/openstack/openstack-image.nix+1−1
@@ -12,8 +12,8 @@ with lib;
12
12
13 system.build.openstackImage = import ../../../lib/make-disk-image.nix {
13 system.build.openstackImage = import ../../../lib/make-disk-image.nix {
14 inherit lib config;
14 inherit lib config;
15− additionalSpace = "1024M";
16 pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
15 pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
16+ diskSize = 8192;
17 format = "qcow2";
17 format = "qcow2";
18 configFile = pkgs.writeText "configuration.nix"
18 configFile = pkgs.writeText "configuration.nix"
19 ''
19 ''
nixos/modules/virtualisation/azure-image.nix+2−3
@@ -9,9 +9,8 @@ in
9
9
10 options = {
10 options = {
11 virtualisation.azureImage.diskSize = mkOption {
11 virtualisation.azureImage.diskSize = mkOption {
12− type = with types; either (enum [ "auto" ]) int;
12+ type = with types; int;
13− default = "auto";
13+ default = 2048;
14− example = 2048;
15 description = ''
14 description = ''
16 Size of disk image. Unit is MB.
15 Size of disk image. Unit is MB.
17 '';
16 '';
nixos/modules/virtualisation/digital-ocean-image.nix+2−3
@@ -10,9 +10,8 @@ in
10
10
11 options = {
11 options = {
12 virtualisation.digitalOceanImage.diskSize = mkOption {
12 virtualisation.digitalOceanImage.diskSize = mkOption {
13− type = with types; either (enum [ "auto" ]) int;
13+ type = with types; int;
14− default = "auto";
14+ default = 4096;
15− example = 4096;
16 description = ''
15 description = ''
17 Size of disk image. Unit is MB.
16 Size of disk image. Unit is MB.
18 '';
17 '';
nixos/modules/virtualisation/google-compute-image.nix+2−3
@@ -18,9 +18,8 @@ in
18
18
19 options = {
19 options = {
20 virtualisation.googleComputeImage.diskSize = mkOption {
20 virtualisation.googleComputeImage.diskSize = mkOption {
21− type = with types; either (enum [ "auto" ]) int;
21+ type = with types; int;
22− default = "auto";
22+ default = 1536;
23− example = 1536;
24 description = ''
23 description = ''
25 Size of disk image. Unit is MB.
24 Size of disk image. Unit is MB.
26 '';
25 '';
nixos/modules/virtualisation/hyperv-image.nix+2−3
@@ -9,9 +9,8 @@ in {
9 options = {
9 options = {
10 hyperv = {
10 hyperv = {
11 baseImageSize = mkOption {
11 baseImageSize = mkOption {
12− type = with types; either (enum [ "auto" ]) int;
12+ type = types.int;
13− default = "auto";
13+ default = 2048;
14− example = 2048;
15 description = ''
14 description = ''
16 The size of the hyper-v base image in MiB.
15 The size of the hyper-v base image in MiB.
17 '';
16 '';
nixos/modules/virtualisation/virtualbox-image.nix+2−3
@@ -11,9 +11,8 @@ in {
11 options = {
11 options = {
12 virtualbox = {
12 virtualbox = {
13 baseImageSize = mkOption {
13 baseImageSize = mkOption {
14− type = with types; either (enum [ "auto" ]) int;
14+ type = types.int;
15− default = "auto";
15+ default = 50 * 1024;
16− example = 50 * 1024;
17 description = ''
16 description = ''
18 The size of the VirtualBox base image in MiB.
17 The size of the VirtualBox base image in MiB.
19 '';
18 '';
nixos/modules/virtualisation/vmware-image.nix+2−3
@@ -18,9 +18,8 @@ in {
18 options = {
18 options = {
19 vmware = {
19 vmware = {
20 baseImageSize = mkOption {
20 baseImageSize = mkOption {
21− type = with types; either (enum [ "auto" ]) int;
21+ type = types.int;
22− default = "auto";
22+ default = 2048;
23− example = 2048;
24 description = ''
23 description = ''
25 The size of the VMWare base image in MiB.
24 The size of the VMWare base image in MiB.
26 '';
25 '';