From 5d412dc67c353fd624079ed5a77ebdaff3167546 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Thu, 12 Jun 2025 08:45:20 +0200 Subject: [PATCH] Removed xf86-video-vmware as it's been dropped: https://gitlab.archlinux.org/archlinux/packaging/packages/xf86-video-vmware/-/issues/3 --- archinstall/lib/hardware.py | 5 +---- schema.json | 10 +++++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/archinstall/lib/hardware.py b/archinstall/lib/hardware.py index 39acf95bcc..12d52df463 100644 --- a/archinstall/lib/hardware.py +++ b/archinstall/lib/hardware.py @@ -51,7 +51,6 @@ class GfxPackage(Enum): Xf86VideoAmdgpu = 'xf86-video-amdgpu' Xf86VideoAti = 'xf86-video-ati' Xf86VideoNouveau = 'xf86-video-nouveau' - Xf86VideoVmware = 'xf86-video-vmware' XorgServer = 'xorg-server' XorgXinit = 'xorg-xinit' @@ -63,7 +62,7 @@ class GfxDriver(Enum): NvidiaOpenKernel = 'Nvidia (open kernel module for newer GPUs, Turing+)' NvidiaOpenSource = 'Nvidia (open-source nouveau driver)' NvidiaProprietary = 'Nvidia (proprietary)' - VMOpenSource = 'VMware / VirtualBox (open-source)' + VMOpenSource = 'VirtualBox (open-source)' def is_nvidia(self) -> bool: match self: @@ -91,7 +90,6 @@ def gfx_packages(self) -> list[GfxPackage]: GfxPackage.Xf86VideoAmdgpu, GfxPackage.Xf86VideoAti, GfxPackage.Xf86VideoNouveau, - GfxPackage.Xf86VideoVmware, GfxPackage.LibvaMesaDriver, GfxPackage.LibvaIntelDriver, GfxPackage.IntelMediaDriver, @@ -136,7 +134,6 @@ def gfx_packages(self) -> list[GfxPackage]: case GfxDriver.VMOpenSource: packages += [ GfxPackage.Mesa, - GfxPackage.Xf86VideoVmware, ] return packages diff --git a/schema.json b/schema.json index 97cb42e1ef..62fb8b102c 100644 --- a/schema.json +++ b/schema.json @@ -83,7 +83,7 @@ "type": "object", "properties": { "type": "string", - "nics": [ + "nics": { "type": "array", "items": { "iface": "string", @@ -97,7 +97,7 @@ "type": "string" } } - ] + } } } }, @@ -175,7 +175,7 @@ "description": "Graphics Drivers to install if a desktop profile is used, ignored otherwise.", "type": "string", "enum": [ - "VMware / VirtualBox (open-source)", + "VirtualBox (open-source)", "Intel (open-source)", "AMD / ATI (open-source)", "All open-source (default)", @@ -222,7 +222,7 @@ ] }, { - "required": [ + "required": { "!users": { "description": "User account", "type": "object", @@ -232,7 +232,7 @@ "sudo": "boolean" } } - ] + } } ] }