fixup: standalone kernel-uvm-gpu package

Author: charludo

overlays/runtimepkgs.nix

@@ -60,6 +60,7 @@ else
               agent
               image
               kernel-uvm
+              kernel-uvm-gpu
               runtime
               runtime-rs
               calculateSnpLaunchDigest

packages/by-name/kata/kernel-uvm-gpu/package.nix

@@ -0,0 +1,6 @@
+# Copyright 2026 Edgeless Systems GmbH
+# SPDX-License-Identifier: BUSL-1.1
+
+{ kernel-uvm, ... }@args:
+
+kernel-uvm.override (removeAttrs args [ "kernel-uvm" ] // { withGPU = true; })

packages/by-name/nvidia-driver/package.nix

@@ -7,10 +7,8 @@
   linuxPackagesFor,
 }:
 
-# The kernel modules have to be built against the very kernel the PodVM boots, so this
-# must stay in sync with the `boot.kernelPackages` set in packages/nixos/kata.nix.
 callPackage ./driver.nix {
-  inherit (linuxPackagesFor (kata.kernel-uvm.override { withGPU = true; }))
+  inherit (linuxPackagesFor kata.kernel-uvm-gpu)
     nvidiaPackages
     ;
 }

packages/nixos/kata.nix

@@ -114,9 +114,10 @@ in
     # Not used directly, but required for kernel-specific driver builds.
     boot.kernelPackages = lib.recurseIntoAttrs (
       pkgs.linuxPackagesFor (
-        pkgs.contrastPkgs.kata.kernel-uvm.override {
-          withGPU = config.contrast.gpu.enable;
-        }
+        if config.contrast.gpu.enable then
+          pkgs.contrastPkgs.kata.kernel-uvm-gpu
+        else
+          pkgs.contrastPkgs.kata.kernel-uvm
       )
     );