From 8731fe1812da5670809d1f7b4cd28aadcac075e4 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 16 Aug 2023 21:49:08 +0200 Subject: [PATCH 1/3] win-qemu: remove --- .../driver/win-qemu/default.nix | 38 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 pkgs/applications/virtualization/driver/win-qemu/default.nix diff --git a/pkgs/applications/virtualization/driver/win-qemu/default.nix b/pkgs/applications/virtualization/driver/win-qemu/default.nix deleted file mode 100644 index c442d978737e..000000000000 --- a/pkgs/applications/virtualization/driver/win-qemu/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, p7zip }: - -stdenv.mkDerivation rec { - pname = "win-qemu"; - version = "0.1.105-1"; - - dontUnpack = true; - - src = fetchurl { - url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso"; - sha256 = "065gz7s77y0q9kfqbr27451sr28rm9azpi88sqjkfph8c6r8q3wc"; - }; - - buildPhase = '' - ${p7zip}/bin/7z x $src - ''; - - installPhase = - let - copy_pvpanic = arch: version: "mkdir -p $out/${arch}/qemupanic; cp pvpanic/${version}/${arch}/* $out/${arch}/qemupanic/. \n"; - copy_pciserial = arch: "mkdir -p $out/${arch}/qemupciserial; cp qemupciserial/* $out/${arch}/qemupciserial/. \n"; - copy_agent = arch: '' - mkdir -p $out/${arch}/qemuagent - cp guest-agent/${if arch=="x86" then "qemu-ga-x86.msi" else "qemu-ga-x64.msi"} $out/${arch}/qemuagent/qemu-guest-agent.msi - (cd $out/${arch}/qemuagent; ${p7zip}/bin/7z x qemu-guest-agent.msi; rm qemu-guest-agent.msi) - ''; - copy = arch: version: (copy_pvpanic arch version) + (copy_pciserial arch) + (copy_agent arch); - in - (copy "amd64" "w8.1") + (copy "x86" "w8.1"); - - meta = with lib; { - description = "Windows QEMU Drivers"; - homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers"; - maintainers = [ ]; - platforms = platforms.linux; - license = licenses.gpl2; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index df389b89d188..c6c74168ac27 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1835,6 +1835,7 @@ mapAliases ({ wineStaging = throw "'wineStaging' has been renamed to/replaced by 'wine-staging'"; # Converted to throw 2022-02-22 wineUnstable = throw "'wineUnstable' has been renamed to/replaced by 'winePackages.unstable'"; # Converted to throw 2022-02-22 wineWayland = wine-wayland; + win-qemu = throw "'win-qemu' has been replaced by 'win-virtio'"; # Added 2023-08-16 winpdb = throw "winpdb has been removed: abandoned by upstream"; # Added 2022-04-22 winusb = throw "'winusb' has been renamed to/replaced by 'woeusb'"; # Converted to throw 2022-02-22 wireguard = throw "'wireguard' has been renamed to/replaced by 'wireguard-tools'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6b5a8bf8e3f..9ce469380e79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36495,7 +36495,6 @@ with pkgs; win-spice = callPackage ../applications/virtualization/driver/win-spice { }; win-virtio = callPackage ../applications/virtualization/driver/win-virtio { }; - win-qemu = callPackage ../applications/virtualization/driver/win-qemu { }; win-pvdrivers = callPackage ../applications/virtualization/driver/win-pvdrivers { }; win-signed-gplpv-drivers = callPackage ../applications/virtualization/driver/win-signed-gplpv-drivers { }; From fba74d25f7ea4d1277267ea27c9403c192ec328d Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 16 Aug 2023 22:14:57 +0200 Subject: [PATCH 2/3] win-virtio: add anthonyroussel to maintainers --- .../virtualization/driver/win-virtio/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix index 28ce2b4627e2..c669300f4d68 100644 --- a/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, libarchive }: + stdenv.mkDerivation rec { pname = "win-virtio"; version = "0.1.229-1"; @@ -26,8 +27,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Windows VirtIO Drivers"; homepage = "https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html"; + changelog = "https://fedorapeople.org/groups/virt/virtio-win/CHANGELOG"; license = [ licenses.bsd3 ]; - maintainers = [ ]; + maintainers = with maintainers; [ anthonyroussel ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; }; } From f445cab1f931691aa99f71035517bfaeecb25a98 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 16 Aug 2023 22:38:41 +0200 Subject: [PATCH 3/3] win-virtio: add updateScript --- .../virtualization/driver/win-virtio/default.nix | 2 ++ .../virtualization/driver/win-virtio/update.sh | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100755 pkgs/applications/virtualization/driver/win-virtio/update.sh diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix index c669300f4d68..fbeb12989cb5 100644 --- a/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Windows VirtIO Drivers"; homepage = "https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html"; diff --git a/pkgs/applications/virtualization/driver/win-virtio/update.sh b/pkgs/applications/virtualization/driver/win-virtio/update.sh new file mode 100755 index 000000000000..b35dd1d9fcf3 --- /dev/null +++ b/pkgs/applications/virtualization/driver/win-virtio/update.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl pup common-updater-scripts + +set -eu -o pipefail + +version="$(curl -Ls https://fedorapeople.org/groups/virt/virtio-win/repo/latest/ | \ + pup 'a[href*="virtio-win-"] text{}' | \ + sed -E 's/virtio-win-(.*)\.noarch\.rpm/\1/' | \ + sort -Vu | \ + tail -n1)" + +update-source-version win-virtio "$version"