win-spice: 0.11 -> 0.21

This includes updates for three components; usbdk, qxlwddm, and vdagent.

The result is updated support from Windows 8.1 to Windows 10.

+29 -21
+29 -21
pkgs/applications/virtualization/driver/win-spice/default.nix
··· 1 { lib, stdenv, fetchurl, p7zip, win-virtio }: 2 3 let 4 src_usbdk_x86 = fetchurl { 5 - url = "https://www.spice-space.org/download/windows/usbdk/UsbDk_1.0.4_x86.msi"; 6 - sha256 = "17hv8034wk1xqnanm5jxs4741nl7asps1fdz6lhnrpp6gvj6yg9y"; 7 }; 8 - 9 src_usbdk_amd64 = fetchurl { 10 - url = "https://www.spice-space.org/download/windows/usbdk/UsbDk_1.0.4_x64.msi"; 11 - sha256 = "0alcqsivp33pm8sy0lmkvq7m5yh6mmcmxdl39zjxjra67kw8r2sd"; 12 }; 13 14 src_qxlwddm = fetchurl { 15 - url = "https://people.redhat.com/~vrozenfe/qxlwddm/qxlwddm-0.11.zip"; 16 - sha256 = "082zdpbh9i3bq2ds8g33rcbcw390jsm7cqf46rrlx02x8r03dm98"; 17 }; 18 19 src_vdagent_x86 = fetchurl { 20 - url = "https://www.spice-space.org/download/windows/vdagent/vdagent-win-0.7.3/vdagent_0_7_3_x86.zip"; 21 - sha256 = "0d928g49rf4dl79jmvnqh6g864hp1flw1f0384sfp82himm3bxjs"; 22 }; 23 - 24 src_vdagent_amd64 = fetchurl { 25 - url = "https://www.spice-space.org/download/windows/vdagent/vdagent-win-0.7.3/vdagent_0_7_3_x64.zip"; 26 - sha256 = "0djmvm66jcmcyhhbjppccbai45nqpva7vyvry6w8nyc0fwi1vm9l"; 27 }; 28 in 29 30 stdenv.mkDerivation { 31 # use version number of qxlwddm as qxlwddm is the most important component 32 - name = "win-spice-0.11"; 33 - version = "0.11"; 34 35 - phases = [ "buildPhase" "installPhase" ]; 36 37 buildPhase = '' 38 mkdir -p usbdk/x86 usbdk/amd64 39 (cd usbdk/x86; ${p7zip}/bin/7z x -y ${src_usbdk_x86}) 40 (cd usbdk/amd64; ${p7zip}/bin/7z x -y ${src_usbdk_amd64}) 41 42 mkdir -p vdagent/x86 vdagent/amd64 43 - (cd vdagent/x86; ${p7zip}/bin/7z x -y ${src_vdagent_x86}; mv vdagent_0_7_3_x86/* .; rm -r vdagent_0_7_3_x86) 44 - (cd vdagent/amd64; ${p7zip}/bin/7z x -y ${src_vdagent_amd64}; mv vdagent_0_7_3_x64/* .; rm -r vdagent_0_7_3_x64) 45 46 mkdir -p qxlwddm 47 - (cd qxlwddm; ${p7zip}/bin/7z x -y ${src_qxlwddm}; mv Win8 w8.1; cd w8.1; mv x64 amd64) 48 - ''; 49 50 installPhase = 51 let ··· 57 # That way it would never matter whether vioserial is installed from win-virtio or win-spice. 58 copy_vioserial = arch: "mkdir -p $out/${arch}/vioserial; cp ${win-virtio}/${arch}/vioserial/* $out/${arch}/vioserial/. \n"; 59 copy = arch: version: (copy_qxl arch version) + (copy_usbdk arch) + (copy_vdagent arch) + (copy_vioserial arch); 60 - in 61 - (copy "amd64" "w8.1") + (copy "x86" "w8.1"); 62 63 meta = with lib; { 64 description = "Windows SPICE Drivers";
··· 1 { lib, stdenv, fetchurl, p7zip, win-virtio }: 2 3 let 4 + version_usbdk = "1.0.22"; 5 src_usbdk_x86 = fetchurl { 6 + url = "https://www.spice-space.org/download/windows/UsbDk/UsbDk_${version_usbdk}_x86.msi"; 7 + sha256 = "1vr8kv37wz6p3xhawyhwxv0g7y89igkvx30zwmyvlgnkv3h5i317"; 8 }; 9 src_usbdk_amd64 = fetchurl { 10 + url = "https://www.spice-space.org/download/windows/UsbDk/UsbDk_${version_usbdk}_x64.msi"; 11 + sha256 = "19b64jv6pfimd54y0pphbs1xh25z41bbblz64ih6ag71w6azdxli"; 12 }; 13 14 + version_qxlwddm = "0.21"; 15 src_qxlwddm = fetchurl { 16 + url = "https://www.spice-space.org/download/windows/qxl-wddm-dod/qxl-wddm-dod-${version_qxlwddm}/spice-qxl-wddm-dod-${version_qxlwddm}.zip"; 17 + sha256 = "0yjq54gxw3lcfghsfs4fzwipa9sgx5b1sn3fss6r5dm7pdvjp20q"; 18 }; 19 20 + version_vdagent = "0.10.0"; 21 src_vdagent_x86 = fetchurl { 22 + url = "https://www.spice-space.org/download/windows/vdagent/vdagent-win-${version_vdagent}/vdagent-win-${version_vdagent}-x86.zip"; 23 + sha256 = "142c0lqsqry9dclji2225ppclkn13gbjl1j0pzx8fp6hgy4i02c1"; 24 }; 25 src_vdagent_amd64 = fetchurl { 26 + url = "https://www.spice-space.org/download/windows/vdagent/vdagent-win-${version_vdagent}/vdagent-win-${version_vdagent}-x64.zip"; 27 + sha256 = "1x2wcvld531kv17a4ks7sh67nhzxzv7nkhpx391n5vj6d12i8g3i"; 28 }; 29 in 30 31 stdenv.mkDerivation { 32 # use version number of qxlwddm as qxlwddm is the most important component 33 + pname = "win-spice"; 34 + version = version_qxlwddm; 35 36 + dontUnpack = true; 37 38 buildPhase = '' 39 + runHook preBuild 40 + 41 mkdir -p usbdk/x86 usbdk/amd64 42 (cd usbdk/x86; ${p7zip}/bin/7z x -y ${src_usbdk_x86}) 43 (cd usbdk/amd64; ${p7zip}/bin/7z x -y ${src_usbdk_amd64}) 44 45 mkdir -p vdagent/x86 vdagent/amd64 46 + (cd vdagent/x86; ${p7zip}/bin/7z x -y ${src_vdagent_x86}; mv vdagent-win-${version_vdagent}-x86/* .; rm -r vdagent-win-${version_vdagent}-x86) 47 + (cd vdagent/amd64; ${p7zip}/bin/7z x -y ${src_vdagent_amd64}; mv vdagent-win-${version_vdagent}-x64/* .; rm -r vdagent-win-${version_vdagent}-x64) 48 49 mkdir -p qxlwddm 50 + (cd qxlwddm; ${p7zip}/bin/7z x -y ${src_qxlwddm}; cd w10) 51 + 52 + runHook postBuild 53 + ''; 54 55 installPhase = 56 let ··· 62 # That way it would never matter whether vioserial is installed from win-virtio or win-spice. 63 copy_vioserial = arch: "mkdir -p $out/${arch}/vioserial; cp ${win-virtio}/${arch}/vioserial/* $out/${arch}/vioserial/. \n"; 64 copy = arch: version: (copy_qxl arch version) + (copy_usbdk arch) + (copy_vdagent arch) + (copy_vioserial arch); 65 + in '' 66 + runHook preInstall 67 + ${(copy "amd64" "w10") + (copy "x86" "w10")} 68 + runHook postInstall 69 + ''; 70 71 meta = with lib; { 72 description = "Windows SPICE Drivers";