pyrox.dev
lol
Merge pull request #13114 from colemickens/azure
azure: package qemu 2.2.0 to fix VHD creation
zimbatm.tngl.sh
+2
-2
nixos/modules/virtualisation/azure-image.nix
+2
-2
nixos/modules/virtualisation/azure-image.nix
···
16
16
cyl=$(((${diskSize}*1024*1024)/(512*63*255)))
17
17
size=$(($cyl*255*63*512))
18
18
roundedsize=$((($size/(1024*1024)+1)*(1024*1024)))
19
-
${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage $roundedsize
19
+
${pkgs.vmTools.qemu-220}/bin/qemu-img create -f raw $diskImage $roundedsize
20
20
mv closure xchg/
21
21
'';
22
22
23
23
postVM =
24
24
''
25
25
mkdir -p $out
26
-
${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vpc -o subformat=fixed $diskImage $out/disk.vhd
26
+
${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -O vpc -o subformat=fixed $diskImage $out/disk.vhd
27
27
rm $diskImage
28
28
'';
29
29
diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw";
+14
nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch
+14
nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch
···
1
+
diff --git a/Makefile b/Makefile
2
+
index d6b9dc1..ce7c493 100644
3
+
--- a/Makefile
4
+
+++ b/Makefile
5
+
@@ -384,8 +384,7 @@ install-confdir:
6
+
install-sysconfig: install-datadir install-confdir
7
+
$(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)"
8
+
9
+
-install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \
10
+
-install-datadir install-localstatedir
11
+
+install: all $(if $(BUILD_DOCS),install-doc) install-datadir
12
+
ifneq ($(TOOLS),)
13
+
$(call install-prog,$(TOOLS),$(DESTDIR)$(bindir))
14
+
endif
+9
pkgs/build-support/vm/default.nix
+9
pkgs/build-support/vm/default.nix
···
11
11
12
12
qemu = pkgs.qemu_kvm;
13
13
14
+
qemu-220 = lib.overrideDerivation pkgs.qemu_kvm (attrs: rec {
15
+
version = "2.2.0";
16
+
src = fetchurl {
17
+
url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
18
+
sha256 = "1703c3scl5n07gmpilg7g2xzyxnr7jczxgx6nn4m8kv9gin9p35n";
19
+
};
20
+
patches = [ ../../../nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch ];
21
+
});
22
+
14
23
qemuProg = "${qemu}/bin/qemu-kvm";
15
24
16
25