From 3948414cc773fdafb7d7535a449532418afb9f1f Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 13 May 2023 19:04:38 +0200 Subject: [PATCH 1/2] win-virtio: 0.1.196-1 -> 0.1.229-1 --- .../applications/virtualization/driver/win-virtio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix index ec8e1e84145b..cbd5c8a6fe66 100644 --- a/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, p7zip }: stdenv.mkDerivation rec { pname = "win-virtio"; - version = "0.1.196-1"; + version = "0.1.229-1"; dontUnpack = true; src = fetchurl { url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso"; - sha256 = "1zj53xybygps66m3v5kzi61vqy987zp6bfgk0qin9pja68qq75vx"; + hash = "sha256-yIoN3jRgXq7mz4ifPioMKvPK65G130WhJcpPcBrLu+A="; }; buildPhase = '' From 0e6443b440a35cbce79ba49d1380756faadf916e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 13 May 2023 19:05:29 +0200 Subject: [PATCH 2/2] win-virtio: refactor - don't use p7zip anymore - just copy everything instead of just some things very elaborately there is no clear motivation given for why this was done in 91b85236d0651983b2d2162623309f497cc0f225 --- .../driver/win-virtio/default.nix | 39 +++++++------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix index cbd5c8a6fe66..28ce2b4627e2 100644 --- a/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix @@ -1,40 +1,31 @@ -{ lib, stdenv, fetchurl, p7zip }: +{ lib, stdenv, fetchurl, libarchive }: stdenv.mkDerivation rec { pname = "win-virtio"; version = "0.1.229-1"; - dontUnpack = true; - src = fetchurl { url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso"; hash = "sha256-yIoN3jRgXq7mz4ifPioMKvPK65G130WhJcpPcBrLu+A="; }; - buildPhase = '' - runHook preBuild - ${p7zip}/bin/7z x $src - runHook postBuild - ''; + nativeBuildInputs = [ + libarchive + ]; - installPhase = - let - copy = arch: version: {input, output}: "mkdir -p $out/${arch}/${output}; cp ${input}/${version}/${arch}/* $out/${arch}/${output}/."; - virtio = [{input="Balloon"; output="vioballoon";} - {input="NetKVM"; output="vionet";} - {input="vioscsi"; output="vioscsi";} - {input="vioserial"; output="vioserial";} - {input="viostor"; output="viostor";} - {input="viorng"; output="viorng";} - ]; - in '' - runHook preInstall - ${lib.concatStringsSep "\n" ((map (copy "amd64" "w10") virtio) ++ (map (copy "x86" "w10") virtio))} - runHook postInstall - ''; + unpackCmd = "mkdir source; bsdtar -xf $curSrc -C source"; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -R ./. $out/ + + runHook postInstall + ''; meta = with lib; { description = "Windows VirtIO Drivers"; - homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers"; + homepage = "https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html"; license = [ licenses.bsd3 ]; maintainers = [ ]; platforms = platforms.linux;