diff options
| -rw-r--r-- | nixos/modules/virtualisation/azure-image.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch | 14 | ||||
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/admin/azure-cli/default.nix | 0 |
4 files changed, 2 insertions, 26 deletions
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index cb756842f36..dd2108ccc37 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -2,13 +2,13 @@ with lib; let - diskSize = 30720; + diskSize = 2048; in { system.build.azureImage = import ../../lib/make-disk-image.nix { name = "azure-image"; postVM = '' - ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -o subformat=fixed -O vpc $diskImage $out/disk.vhd + ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -o subformat=fixed,force_size -O vpc $diskImage $out/disk.vhd ''; configFile = ./azure-config-user.nix; format = "raw"; diff --git a/nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch b/nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch deleted file mode 100644 index 81d29feea3d..00000000000 --- a/nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Makefile b/Makefile -index d6b9dc1..ce7c493 100644 ---- a/Makefile -+++ b/Makefile -@@ -384,8 +384,7 @@ install-confdir: - install-sysconfig: install-datadir install-confdir - $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)" - --install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \ --install-datadir install-localstatedir -+install: all $(if $(BUILD_DOCS),install-doc) install-datadir - ifneq ($(TOOLS),) - $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) - endif diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 622fba0686f..9cdcc2a752d 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -14,16 +14,6 @@ rec { qemu = pkgs.qemu_kvm; - qemu-220 = lib.overrideDerivation pkgs.qemu_kvm (attrs: rec { - version = "2.2.0"; - src = fetchurl { - url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2"; - sha256 = "1703c3scl5n07gmpilg7g2xzyxnr7jczxgx6nn4m8kv9gin9p35n"; - }; - patches = [ ../../../nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch ]; - }); - - modulesClosure = makeModulesClosure { inherit kernel rootModules; firmware = kernel; diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/pkgs/tools/admin/azure-cli/default.nix |