virtio-win: rename from win-virtio

+21 -19
+2
nixos/doc/manual/release-notes/rl-2311.section.md
··· 303 303 304 304 - `dagger` was removed because using a package called `dagger` and packaging it from source violates their trademark policy. 305 305 306 + - `win-virtio` package was renamed to `virtio-win` to be consistent with the upstream package name. 307 + 306 308 ## Other Notable Changes {#sec-release-23.11-notable-changes} 307 309 308 310 - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.
+4 -4
pkgs/applications/virtualization/driver/win-spice/default.nix
··· 1 - { lib, stdenv, fetchurl, p7zip, win-virtio }: 1 + { lib, stdenv, fetchurl, p7zip, virtio-win }: 2 2 3 3 let 4 4 version_usbdk = "1.0.22"; ··· 58 58 copy_usbdk = arch: "mkdir -p $out/${arch}/usbdk; cp usbdk/${arch}/* $out/${arch}/usbdk/. \n"; 59 59 copy_vdagent = arch: "mkdir -p $out/${arch}/vdagent; cp vdagent/${arch}/* $out/${arch}/vdagent/. \n"; 60 60 # SPICE needs vioserial 61 - # TODO: Link windows version in win-spice (here) to version used in win-virtio. 62 - # That way it would never matter whether vioserial is installed from win-virtio or win-spice. 63 - copy_vioserial = arch: version: "mkdir -p $out/${arch}/vioserial; cp ${win-virtio}/vioserial/${version}/${arch}/* $out/${arch}/vioserial/. \n"; 61 + # TODO: Link windows version in win-spice (here) to version used in virtio-win. 62 + # That way it would never matter whether vioserial is installed from virtio-win or win-spice. 63 + copy_vioserial = arch: version: "mkdir -p $out/${arch}/vioserial; cp ${virtio-win}/vioserial/${version}/${arch}/* $out/${arch}/vioserial/. \n"; 64 64 copy = arch: version: (copy_qxl arch version) + (copy_usbdk arch) + (copy_vdagent arch) + (copy_vioserial arch version); 65 65 in '' 66 66 runHook preInstall
+1 -1
pkgs/applications/virtualization/driver/win-virtio/default.nix pkgs/by-name/vi/virtio-win/package.nix
··· 1 1 { lib, stdenv, fetchurl, libarchive }: 2 2 3 3 stdenv.mkDerivation rec { 4 - pname = "win-virtio"; 4 + pname = "virtio-win"; 5 5 version = "0.1.240-1"; 6 6 7 7 src = fetchurl {
-12
pkgs/applications/virtualization/driver/win-virtio/update.sh
··· 1 - #!/usr/bin/env nix-shell 2 - #!nix-shell -i bash -p curl pup common-updater-scripts 3 - 4 - set -eu -o pipefail 5 - 6 - version="$(curl -Ls https://fedorapeople.org/groups/virt/virtio-win/repo/latest/ | \ 7 - pup 'a[href*="virtio-win-"] text{}' | \ 8 - sed -E 's/virtio-win-(.*)\.noarch\.rpm/\1/' | \ 9 - sort -Vu | \ 10 - tail -n1)" 11 - 12 - update-source-version win-virtio "$version"
+12
pkgs/by-name/vi/virtio-win/update.sh
··· 1 + #!/usr/bin/env nix-shell 2 + #!nix-shell -i bash -p curl pup common-updater-scripts 3 + 4 + set -eu -o pipefail 5 + 6 + version="$(curl -Ls https://fedorapeople.org/groups/virt/virtio-win/repo/latest/ | \ 7 + pup 'a[href*="virtio-win-"] text{}' | \ 8 + sed -E 's/virtio-win-(.*)\.noarch\.rpm/\1/' | \ 9 + sort -Vu | \ 10 + tail -n1)" 11 + 12 + update-source-version virtio-win "$version"
+2 -1
pkgs/top-level/aliases.nix
··· 936 936 webkitgtk_5_0 = throw "'webkitgtk_5_0' has been superseded by 'webkitgtk_6_0'"; # Added 2023-02-25 937 937 wio = throw "wio has been removed from nixpkgs, it was unmaintained and required wlroots_0_14 at the time of removal"; # Added 2023-04-28 938 938 wineWayland = wine-wayland; 939 - win-qemu = throw "'win-qemu' has been replaced by 'win-virtio'"; # Added 2023-08-16 939 + win-qemu = throw "'win-qemu' has been replaced by 'virtio-win'"; # Added 2023-08-16 940 + win-virtio = virtio-win; # Added 2023-10-17 940 941 win-signed-gplpv-drivers = throw "win-signed-gplpv-drivers has been removed from nixpkgs, as it's unmaintained: https://help.univention.com/t/installing-signed-gplpv-drivers/21828"; # Added 2023-08-17 941 942 wlroots_0_14 = throw "'wlroots_0_14' has been removed in favor of newer versions"; # Added 2023-07-29 942 943 wordpress6_1 = throw "'wordpress6_1' has been removed in favor of the latest version"; # Added 2023-10-10
-1
pkgs/top-level/all-packages.nix
··· 36673 36673 xkbmon = callPackage ../applications/misc/xkbmon { }; 36674 36674 36675 36675 win-spice = callPackage ../applications/virtualization/driver/win-spice { }; 36676 - win-virtio = callPackage ../applications/virtualization/driver/win-virtio { }; 36677 36676 win-pvdrivers = callPackage ../applications/virtualization/driver/win-pvdrivers { }; 36678 36677 36679 36678 xfig = callPackage ../applications/graphics/xfig { };