From 7d90e85ef42ca56286b98714cc7694d874608f2b Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 17 Oct 2023 23:38:15 +0200 Subject: [PATCH] virtio-win: rename from win-virtio --- nixos/doc/manual/release-notes/rl-2311.section.md | 2 ++ .../virtualization/driver/win-spice/default.nix | 8 ++++---- .../default.nix => by-name/vi/virtio-win/package.nix} | 2 +- .../driver/win-virtio => by-name/vi/virtio-win}/update.sh | 2 +- pkgs/top-level/aliases.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 - 6 files changed, 10 insertions(+), 8 deletions(-) rename pkgs/{applications/virtualization/driver/win-virtio/default.nix => by-name/vi/virtio-win/package.nix} (97%) rename pkgs/{applications/virtualization/driver/win-virtio => by-name/vi/virtio-win}/update.sh (88%) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index b85e7c81a651..52c2de24b6ba 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -303,6 +303,8 @@ - `dagger` was removed because using a package called `dagger` and packaging it from source violates their trademark policy. +- `win-virtio` package was renamed to `virtio-win` to be consistent with the upstream package name. + ## Other Notable Changes {#sec-release-23.11-notable-changes} - 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. diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/pkgs/applications/virtualization/driver/win-spice/default.nix index 9bbbe640148d..ff3364b1ae92 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/by-name/vi/virtio-win/package.nix similarity index 97% rename from pkgs/applications/virtualization/driver/win-virtio/default.nix rename to pkgs/by-name/vi/virtio-win/package.nix index 97fecfaeda36..5c1bb96b9e25 100644 --- a/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/pkgs/by-name/vi/virtio-win/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, libarchive }: stdenv.mkDerivation rec { - pname = "win-virtio"; + pname = "virtio-win"; version = "0.1.240-1"; src = fetchurl { diff --git a/pkgs/applications/virtualization/driver/win-virtio/update.sh b/pkgs/by-name/vi/virtio-win/update.sh similarity index 88% rename from pkgs/applications/virtualization/driver/win-virtio/update.sh rename to pkgs/by-name/vi/virtio-win/update.sh index b35dd1d9fcf3..99a0f30fe4a6 100755 --- a/pkgs/applications/virtualization/driver/win-virtio/update.sh +++ b/pkgs/by-name/vi/virtio-win/update.sh @@ -9,4 +9,4 @@ version="$(curl -Ls https://fedorapeople.org/groups/virt/virtio-win/repo/latest/ sort -Vu | \ tail -n1)" -update-source-version win-virtio "$version" +update-source-version virtio-win "$version" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 12e7b72bc0c9..0aa22555d862 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -936,7 +936,8 @@ mapAliases ({ webkitgtk_5_0 = throw "'webkitgtk_5_0' has been superseded by 'webkitgtk_6_0'"; # Added 2023-02-25 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 wineWayland = wine-wayland; - win-qemu = throw "'win-qemu' has been replaced by 'win-virtio'"; # Added 2023-08-16 + win-qemu = throw "'win-qemu' has been replaced by 'virtio-win'"; # Added 2023-08-16 + win-virtio = virtio-win; # Added 2023-10-17 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 wlroots_0_14 = throw "'wlroots_0_14' has been removed in favor of newer versions"; # Added 2023-07-29 wordpress6_1 = throw "'wordpress6_1' has been removed in favor of the latest version"; # Added 2023-10-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6f366214a0b..ad15dd61a977 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36673,7 +36673,6 @@ with pkgs; xkbmon = callPackage ../applications/misc/xkbmon { }; win-spice = callPackage ../applications/virtualization/driver/win-spice { }; - win-virtio = callPackage ../applications/virtualization/driver/win-virtio { }; win-pvdrivers = callPackage ../applications/virtualization/driver/win-pvdrivers { }; xfig = callPackage ../applications/graphics/xfig { };