diff options
Diffstat (limited to 'pkgs/applications/virtualization/driver')
3 files changed, 4 insertions, 54 deletions
diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/pkgs/applications/virtualization/driver/win-spice/default.nix index 9bbbe640148..ff3364b1ae9 100644 --- a/pkgs/applications/virtualization/driver/win-spice/default.nix +++ b/pkgs/applications/virtualization/driver/win-spice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, p7zip, win-virtio }: +{ lib, stdenv, fetchurl, p7zip, virtio-win }: let version_usbdk = "1.0.22"; @@ -58,9 +58,9 @@ stdenv.mkDerivation { copy_usbdk = arch: "mkdir -p $out/${arch}/usbdk; cp usbdk/${arch}/* $out/${arch}/usbdk/. \n"; copy_vdagent = arch: "mkdir -p $out/${arch}/vdagent; cp vdagent/${arch}/* $out/${arch}/vdagent/. \n"; # SPICE needs vioserial - # TODO: Link windows version in win-spice (here) to version used in win-virtio. - # That way it would never matter whether vioserial is installed from win-virtio or win-spice. - copy_vioserial = arch: version: "mkdir -p $out/${arch}/vioserial; cp ${win-virtio}/vioserial/${version}/${arch}/* $out/${arch}/vioserial/. \n"; + # TODO: Link windows version in win-spice (here) to version used in virtio-win. + # That way it would never matter whether vioserial is installed from virtio-win or win-spice. + copy_vioserial = arch: version: "mkdir -p $out/${arch}/vioserial; cp ${virtio-win}/vioserial/${version}/${arch}/* $out/${arch}/vioserial/. \n"; copy = arch: version: (copy_qxl arch version) + (copy_usbdk arch) + (copy_vdagent arch) + (copy_vioserial arch version); in '' runHook preInstall diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix deleted file mode 100644 index 97fecfaeda3..00000000000 --- a/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, libarchive }: - -stdenv.mkDerivation rec { - pname = "win-virtio"; - version = "0.1.240-1"; - - src = fetchurl { - url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso"; - hash = "sha256-69SCWGaPf3jgJu0nbCip0Z2D4CD/oICtaZENyGu8vMY="; - }; - - nativeBuildInputs = [ - libarchive - ]; - - unpackCmd = "mkdir source; bsdtar -xf $curSrc -C source"; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -R ./. $out/ - - 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"; - changelog = "https://fedorapeople.org/groups/virt/virtio-win/CHANGELOG"; - license = [ licenses.bsd3 ]; - maintainers = with maintainers; [ anthonyroussel ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/virtualization/driver/win-virtio/update.sh b/pkgs/applications/virtualization/driver/win-virtio/update.sh deleted file mode 100755 index b35dd1d9fcf..00000000000 --- a/pkgs/applications/virtualization/driver/win-virtio/update.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/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" |