Overhaul nvidia packaging for a brave new world

packages/n/nvidia-470-glx-driver/package.yml

@@ -1,9 +1,10 @@
 # yaml-language-server: $schema=/usr/share/ypkg/schema/schema.json
 name       : nvidia-470-glx-driver
 version    : 470.256.02
-release    : 150
+release    : 151
 source     :
-    - https://us.download.nvidia.com/XFree86/Linux-x86_64/470.256.02/NVIDIA-Linux-x86_64-470.256.02.run : d6451862deb695bb0447f3b7cd6268f73e81168c10e2c10597ff3fa01349b1de
+    - https://us.download.nvidia.com/XFree86/Linux-x86_64/470.256.02/NVIDIA-Linux-x86_64-470.256.02.run : 
+        d6451862deb695bb0447f3b7cd6268f73e81168c10e2c10597ff3fa01349b1de
 extract    : false
 homepage   : https://nvidia.com
 license    :
@@ -35,21 +36,30 @@ rundeps    :
         - linux-driver-management
     - main : nvidia-470-glx-driver-common
 conflicts  :
+    - nvidia-580-glx-driver
     - nvidia-beta-driver
     - nvidia-developer-driver
     - nvidia-glx-driver
+    - nvidia-open
+    - nvidia-utils
     - common :
+        - nvidia-580-glx-driver-common
         - nvidia-beta-driver-common
         - nvidia-developer-driver-common
         - nvidia-glx-driver-common
+        - nvidia-utils
     - 32bit :
+        - nvidia-580-glx-driver-32bit
         - nvidia-beta-driver-32bit
         - nvidia-developer-driver-32bit
         - nvidia-glx-driver-32bit
+        - nvidia-utils-32bit
     - current :
+        - nvidia-580-glx-driver-current
         - nvidia-beta-driver-current
         - nvidia-developer-driver-current
         - nvidia-glx-driver-current
+        - nvidia-open-current
 patterns   :
     - common : /*
     - modaliases :

packages/n/nvidia-470-glx-driver/pspec_x86_64.xml

@@ -1,10 +1,10 @@
 <PISI>
     <Source>
         <Name>nvidia-470-glx-driver</Name>
         <Homepage>https://nvidia.com</Homepage>
         <Packager>
-            <Name>Troy Harvey</Name>
-            <Email>harvey@getsol.us</Email>
+            <Name>Joey Riches</Name>
+            <Email>josephriches@gmail.com</Email>
         </Packager>
         <License>EULA</License>
         <PartOf>kernel.drivers</PartOf>
@@ -18,7 +18,7 @@
         <Description xml:lang="en">NVIDIA 470.xx Binary Driver (LTS Kernel)</Description>
         <PartOf>kernel.drivers</PartOf>
         <RuntimeDependencies>
-            <Dependency releaseFrom="150">nvidia-470-glx-driver-common</Dependency>
+            <Dependency releaseFrom="151">nvidia-470-glx-driver-common</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib64/kernel/initrd-com.solus-project.lts.6.18.40-299.nvidia</Path>
@@ -31,9 +31,12 @@
             <Path fileType="data">/usr/share/metainfo/nvidia-470-lts.metainfo.xml</Path>
         </Files>
         <Conflicts>
+            <Package>nvidia-580-glx-driver</Package>
             <Package>nvidia-beta-driver</Package>
             <Package>nvidia-developer-driver</Package>
             <Package>nvidia-glx-driver</Package>
+            <Package>nvidia-open</Package>
+            <Package>nvidia-utils</Package>
         </Conflicts>
     </Package>
     <Package>
@@ -42,7 +45,7 @@
         <Description xml:lang="en">32-bit libraries for NVIDIA 470.xx Binary Driver</Description>
         <PartOf>xorg.driver</PartOf>
         <RuntimeDependencies>
-            <Dependency releaseFrom="150">nvidia-470-glx-driver-common</Dependency>
+            <Dependency releaseFrom="151">nvidia-470-glx-driver-common</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib32/libEGL_nvidia.so</Path>
@@ -105,9 +108,11 @@
             <Path fileType="data">/usr/share/metainfo/nvidia-470-32bit.metainfo.xml</Path>
         </Files>
         <Conflicts>
+            <Package>nvidia-580-glx-driver-32bit</Package>
             <Package>nvidia-beta-driver-32bit</Package>
             <Package>nvidia-developer-driver-32bit</Package>
             <Package>nvidia-glx-driver-32bit</Package>
+            <Package>nvidia-utils-32bit</Package>
         </Conflicts>
     </Package>
     <Package>
@@ -238,9 +243,11 @@
             <Path fileType="data">/usr/share/vulkan/implicit_layer.d/nvidia_layers.json</Path>
         </Files>
         <Conflicts>
+            <Package>nvidia-580-glx-driver-common</Package>
             <Package>nvidia-beta-driver-common</Package>
             <Package>nvidia-developer-driver-common</Package>
             <Package>nvidia-glx-driver-common</Package>
+            <Package>nvidia-utils</Package>
         </Conflicts>
     </Package>
     <Package>
@@ -254,12 +261,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="150">
+        <Update release="151">
             <Date>2026-07-25</Date>
             <Version>470.256.02</Version>
             <Comment>Packaging update</Comment>
-            <Name>Troy Harvey</Name>
-            <Email>harvey@getsol.us</Email>
+            <Name>Joey Riches</Name>
+            <Email>josephriches@gmail.com</Email>
         </Update>
     </History>
 </PISI>

packages/n/nvidia-580-glx-driver/files/nvidia-580-32bit.metainfo.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="addon">
+    <id>nvidia-580-glx-driver-32bit</id>
+    <name>32bit libraries for NVIDIA 580.xx Binary Driver</name>
+    <summary>32bit libraries for NVIDIA 580.xx Binary Driver. Generally required by older games.</summary>
+    <url type="homepage">https://www.nvidia.com/</url>
+    <url type="bugtracker">https://github.com/getsolus/packages</url>
+    <developer id="com.nvidia">
+        <name>NVIDIA Corporation</name>
+    </developer>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>LicenseRef-proprietary:NVIDIA</project_license>
+    <extends>nvidia-580-glx-driver-current</extends>
+    <extends>nvidia-580-glx-driver-lts</extends>
+</component>

packages/n/nvidia-glx-driver/files/nvidia-current.metainfo.xml → packages/n/nvidia-580-glx-driver/files/nvidia-580-current.metainfo.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="driver">
-  <id>nvidia-glx-driver-current</id>
-  <name>NVIDIA Graphics Driver</name>
-  <summary>NVIDIA accelerated Linux Graphics Driver</summary>
+  <id>nvidia-580-glx-driver-current</id>
+  <name>NVIDIA Graphics Driver 580.xx</name>
+  <summary>NVIDIA accelerated Linux Graphics Driver (580 legacy branch)</summary>
   <description>
     <p>
       The NVIDIA Accelerated Linux Graphics Driver brings accelerated 2D
@@ -15,6 +15,10 @@
       The NVIDIA graphics driver uses a Unified Driver Architecture: the single
       graphics driver supports all modern NVIDIA GPUs.
     </p>
+    <p>
+      This is the 580 legacy branch providing support for Volta, Pascal, and
+      other GPUs that lack support in newer NVIDIA driver releases.
+    </p>
   </description>
   <url type="homepage">https://www.nvidia.com/</url>
   <icon type="remote" width="128" height="128">https://raw.githubusercontent.com/NVIDIA/nvidia-settings/refs/heads/main/doc/nvidia-settings.png</icon>

packages/n/nvidia-glx-driver/files/nvidia-lts.metainfo.xml → packages/n/nvidia-580-glx-driver/files/nvidia-580-lts.metainfo.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="driver">
-  <id>nvidia-glx-driver-lts</id>
-  <name>NVIDIA Graphics Driver (LTS Kernel)</name>
-  <summary>NVIDIA accelerated Linux Graphics Driver for the LTS kernel</summary>
+  <id>nvidia-580-glx-driver-lts</id>
+  <name>NVIDIA Graphics Driver 580.xx (LTS Kernel)</name>
+  <summary>NVIDIA accelerated Linux Graphics Driver for the LTS kernel (580 legacy branch)</summary>
   <description>
     <p>
       The NVIDIA Accelerated Linux Graphics Driver brings accelerated 2D
@@ -15,6 +15,10 @@
       The NVIDIA graphics driver uses a Unified Driver Architecture: the single
       graphics driver supports all modern NVIDIA GPUs.
     </p>
+    <p>
+      This is the 580 legacy branch providing support for Volta, Pascal, and
+      other GPUs that lack support in newer NVIDIA driver releases.
+    </p>
   </description>
   <url type="homepage">https://www.nvidia.com/</url>
   <icon type="remote" width="128" height="128">https://raw.githubusercontent.com/NVIDIA/nvidia-settings/refs/heads/main/doc/nvidia-settings.png</icon>

packages/n/nvidia-glx-driver/monitoring.yaml → packages/n/nvidia-580-glx-driver/monitoring.yaml

@@ -1,6 +1,9 @@
 releases:
   id: 5454
   rss: ~
+  ignore:
+    # Don't notify about newer versions, 580 is the legacy branch
+    - .*
 security:
   cpe:
     - vendor: nvidia

packages/n/nvidia-glx-driver/package.yml → packages/n/nvidia-580-glx-driver/package.yml

@@ -1,83 +1,90 @@
 # yaml-language-server: $schema=/usr/share/ypkg/schema/schema.json
-# If you are updating this package please update nvidia-beta-driver as well if that package is on a lesser version than this one.
-# nvidia-beta-driver should always be ahead of nvidia-glx-driver version-wise or at the same version, never behind.
-name       : nvidia-glx-driver
+name       : nvidia-580-glx-driver
 version    : 580.173.02
-release    : 614
+release    : 1
 source     :
     - https://us.download.nvidia.com/XFree86/Linux-x86_64/580.173.02/NVIDIA-Linux-x86_64-580.173.02.run : 8d8eb9001e05a9a8a663d3d5d304feb64ef2844ee185ccdfd952786820f46e1b
 extract    : false
 homepage   : https://nvidia.com
 license    :
     - EULA
 summary    :
-    - NVIDIA Binary Driver (LTS Kernel)
-    - common : Shared assets for the NVIDIA GLX Driver
-    - current : NVIDIA Binary Driver (Current Kernel)
+    - NVIDIA 580.xx Binary Driver (LTS Kernel)
+    - common : Shared assets for the NVIDIA 580.xx Binary Driver
+    - current : NVIDIA 580.xx Binary Driver (Current Kernel)
     - modaliases : These files are used by the Software Center for hardware detection
-    - 32bit : 32-bit libraries for NVIDIA Binary Driver
+    - 32bit : 32-bit libraries for NVIDIA 580.xx Binary Driver
 component  :
     - kernel.drivers
     - common : xorg.driver
     - current : kernel.drivers
     - modaliases : kernel.drivers
     - 32bit : xorg.driver
 description:
-    - NVIDIA Binary Driver (LTS Kernel)
-    - common : Shared assets for the NVIDIA GLX Driver
-    - current : NVIDIA Binary Driver (Current Kernel)
+    - NVIDIA 580.xx Binary Driver (LTS Kernel). This legacy branch provides support for Volta, Pascal, and other GPUs that lack support in newer NVIDIA driver releases.
+    - common : Shared assets for the NVIDIA 580.xx Binary Driver
+    - current : NVIDIA 580.xx Binary Driver (Current Kernel)
     - modaliases : These files are used by the Software Center for hardware detection
-    - 32bit : 32-bit libraries for NVIDIA Binary Driver
+    - 32bit : 32-bit libraries for NVIDIA 580.xx Binary Driver
 rundeps    :
     - 32bit :
         - egl-gbm-32bit
         - egl-wayland-32bit
         - egl-x11-32bit
         - libglvnd-32bit
-        - nvidia-glx-driver-common
+        - nvidia-580-glx-driver-common
     - common :
         - egl-gbm
         - egl-wayland
         - egl-x11
         - kbd
         - libglvnd
         - linux-driver-management
-    - current : nvidia-glx-driver-common
-    - main : nvidia-glx-driver-common
+    - current : nvidia-580-glx-driver-common
+    - main : nvidia-580-glx-driver-common
 conflicts  :
     - nvidia-470-glx-driver
     - nvidia-beta-driver
     - nvidia-developer-driver
+    - nvidia-glx-driver
+    - nvidia-open
+    - nvidia-utils
     - common :
         - nvidia-470-glx-driver-common
         - nvidia-beta-driver-common
         - nvidia-developer-driver-common
+        - nvidia-glx-driver-common
+        - nvidia-utils
     - 32bit :
         - nvidia-470-glx-driver-32bit
         - nvidia-beta-driver-32bit
         - nvidia-developer-driver-32bit
+        - nvidia-glx-driver-32bit
+        - nvidia-utils-32bit
     - current :
         - nvidia-470-glx-driver-current
         - nvidia-beta-driver-current
         - nvidia-developer-driver-current
+        - nvidia-glx-driver-current
+        - nvidia-open-current
 patterns   :
     - common : /*
     - modaliases :
         - /usr/share/doflicky/modaliases
         - /usr/share/linux-driver-management/modaliases
     - 32bit :
         - /usr/lib32
-        - /usr/share/metainfo/nvidia-32bit.metainfo.xml
+        - /usr/share/metainfo/nvidia-580-32bit.metainfo.xml
     - main :
         - /lib64/modules/*.lts
         - /usr/lib64/kernel/initrd-com.solus-project.lts.*
         - /usr/lib64/modules/*.lts
-        - /usr/share/metainfo/nvidia-lts.metainfo.xml
+        - /usr/share/metainfo/nvidia-580-lts.metainfo.xml
     - current :
         - /lib64/modules/*.current
         - /usr/lib64/kernel/initrd-com.solus-project.current.*
         - /usr/lib64/modules/*.current
-        - /usr/share/metainfo/nvidia-current.metainfo.xml
+        - /usr/share/metainfo/nvidia-580-current.metainfo.xml
 strip      : false
 debug      : false
 builddeps  :
@@ -194,15 +201,15 @@ install    : |
     curmajkernelv=$(echo %kernel_version_current% | cut -d '.' -f 1,2)
     ltsmajkernelv=$(echo %kernel_version_lts% | cut -d '.' -f 1,2)
     # FIXME: use xmllint
-    sed -i "s/9.99/${curmajkernelv}/" $pkgfiles/nvidia-current.metainfo.xml
-    sed -i "s/9.99/${ltsmajkernelv}/" $pkgfiles/nvidia-lts.metainfo.xml
+    sed -i "s/9.99/${curmajkernelv}/" $pkgfiles/nvidia-580-current.metainfo.xml
+    sed -i "s/9.99/${ltsmajkernelv}/" $pkgfiles/nvidia-580-lts.metainfo.xml
     # Appstream metainfo
-    install -Dm00644 $pkgfiles/nvidia-current.metainfo.xml $installdir/usr/share/metainfo/nvidia-current.metainfo.xml
-    install -Dm00644 $pkgfiles/nvidia-lts.metainfo.xml $installdir/usr/share/metainfo/nvidia-lts.metainfo.xml
-    install -Dm00644 $pkgfiles/nvidia-32bit.metainfo.xml $installdir/usr/share/metainfo/nvidia-32bit.metainfo.xml
+    install -Dm00644 $pkgfiles/nvidia-580-current.metainfo.xml $installdir/usr/share/metainfo/nvidia-580-current.metainfo.xml
+    install -Dm00644 $pkgfiles/nvidia-580-lts.metainfo.xml $installdir/usr/share/metainfo/nvidia-580-lts.metainfo.xml
+    install -Dm00644 $pkgfiles/nvidia-580-32bit.metainfo.xml $installdir/usr/share/metainfo/nvidia-580-32bit.metainfo.xml
     # Add modalias provides to appstream metainfo
-    python3 $pkgfiles/parse-supported-gpus.py supported-gpus/supported-gpus.json | $pkgfiles/modalias-util.py $installdir/usr/share/metainfo/nvidia-current.metainfo.xml
-    python3 $pkgfiles/parse-supported-gpus.py supported-gpus/supported-gpus.json | $pkgfiles/modalias-util.py $installdir/usr/share/metainfo/nvidia-lts.metainfo.xml
+    python3 $pkgfiles/parse-supported-gpus.py supported-gpus/supported-gpus.json | $pkgfiles/modalias-util.py $installdir/usr/share/metainfo/nvidia-580-current.metainfo.xml
+    python3 $pkgfiles/parse-supported-gpus.py supported-gpus/supported-gpus.json | $pkgfiles/modalias-util.py $installdir/usr/share/metainfo/nvidia-580-lts.metainfo.xml
 
     # Vulkan
     install -Dm00644 nvidia_icd.json $installdir/usr/share/vulkan/icd.d/10_nvidia.json
@@ -244,8 +251,8 @@ install    : |
 
     # Additional files
     install -D -m 00644 $pkgfiles/nvidia.rules $installdir/%libdir%/udev/rules.d/60-nvidia.rules
-    install -D -m 00644 $pkgfiles/nvidia-glx-driver.tmpfiles $installdir/%libdir%/tmpfiles.d/nvidia-glx-driver.conf
-    install -D -m 00644 $pkgfiles/nvidia-glx-driver.sysusers $installdir/%libdir%/sysusers.d/nvidia-glx-driver.conf
+    install -D -m 00644 $pkgfiles/nvidia-580-glx-driver.tmpfiles $installdir/%libdir%/tmpfiles.d/nvidia-580-glx-driver.conf
+    install -D -m 00644 $pkgfiles/nvidia-580-glx-driver.sysusers $installdir/%libdir%/sysusers.d/nvidia-580-glx-driver.conf
 
     # We enable modprobe and fbdev by default now, but we still need to the corresponding kernel args until either we support
     # early KMS with grub or it's determined that the 0001-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch kernel patch