cudaPackages.cuda_nvtx: rename to nvtx

NVTX is to be built from source where possible, so it is no longer named after the redistributable. The
redistributable build moves to nvtx/redist.nix, and cuda_nvtx becomes a deprecated alias.

No rebuilds: the redistributable keeps its pname.

Assisted-by: Claude Code (Claude Opus 5.5)

pkgs/by-name/oc/octopus/package.nix

@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
     cudaPackages.libcublas
     cudaPackages.libcufft
     cudaPackages.cuda_nvrtc
-    cudaPackages.cuda_nvtx
+    cudaPackages.nvtx
   ]
   ++ lib.optionals enableHip [
     rocmPackages.clr

pkgs/by-name/si/sirius/package.nix

@@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals (gpuBackend == "cuda") [
     cudaPackages.cuda_cudart
     cudaPackages.cuda_profiler_api
-    cudaPackages.cuda_nvtx
+    cudaPackages.nvtx
     cudaPackages.libcufft
     cudaPackages.libcusolver
     cudaPackages.libcublas

pkgs/by-name/xl/xla/cuda-local.nix

@@ -29,7 +29,7 @@ let
       cuda_nvdisasm
       cuda_nvprune
       cuda_profiler_api
-      cuda_nvtx
+      nvtx
     ]
     ++ lib.optional (lib.versionAtLeast cudaPackages.cuda_nvcc.version "13") cudaPackages.cuda_crt;
   cudaRoots = lib.unique (

pkgs/development/cuda-modules/aliases.nix

@@ -16,4 +16,10 @@ builtins.mapAttrs mkRenamed {
     path = "cccl";
     package = final.cccl;
   };
+
+  # NVTX is built from source when possible, so it is no longer named after the redistributable.
+  cuda_nvtx = {
+    path = "nvtx";
+    package = final.nvtx;
+  };
 }

pkgs/development/cuda-modules/packages/cuda-samples.nix

@@ -8,7 +8,7 @@
   cuda_cudart,
   cuda_nvcc,
   cuda_nvrtc,
-  cuda_nvtx,
+  nvtx,
   cuda_profiler_api,
   cudaAtLeast,
   cudaNamePrefix,
@@ -187,7 +187,7 @@ backendStdenv.mkDerivation (finalAttrs: {
     cccl
     cuda_cudart
     cuda_nvrtc
-    cuda_nvtx
+    nvtx
     cuda_profiler_api
     libcublas
     libcufft

pkgs/development/cuda-modules/packages/cudatoolkit.nix

@@ -16,7 +16,7 @@
   cuda_nvml_dev ? null,
   cuda_nvprune ? null,
   cuda_nvrtc ? null,
-  cuda_nvtx ? null,
+  nvtx ? null,
   cuda_profiler_api ? null,
   cuda_sanitizer_api ? null,
   libcublas ? null,
@@ -46,7 +46,7 @@ let
     cuda_cuxxfilt
     cuda_nvml_dev
     cuda_nvrtc
-    cuda_nvtx
+    nvtx
     cuda_profiler_api
     cuda_sanitizer_api
     libcublas

pkgs/development/cuda-modules/packages/libnvshmem.nix

@@ -9,7 +9,7 @@
   cuda_nvcc,
   cuda_nvml_dev,
   cuda_nvrtc,
-  cuda_nvtx,
+  nvtx,
   cudaAtLeast,
   cudaMajorMinorVersion,
   cudaNamePrefix,
@@ -125,7 +125,7 @@ backendStdenv.mkDerivation (finalAttrs: {
     cuda_cudart
     cuda_nvml_dev
     cuda_nvrtc
-    cuda_nvtx
+    nvtx
     libnvjitlink
     rdma-core
   ]

pkgs/development/cuda-modules/packages/nvtx/package.nix

@@ -0,0 +1,2 @@
+{ callPackage }:
+callPackage ./redist.nix { }

pkgs/development/cuda-modules/packages/nvtx/redist.nix

@@ -1,6 +1,7 @@
 { buildRedist }:
 buildRedist {
   redistName = "cuda";
+  # NOTE: The redistributable is named cuda_nvtx in the manifests.
   pname = "cuda_nvtx";
 
   outputs = [

pkgs/development/python-modules/cupy/default.nix

@@ -141,7 +141,7 @@ buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } (finalAttrs
     cuda_cudart # cuda.h, cuda_runtime.h, libcudart_static.a
     cuda_cuxxfilt # nv_decode.h
     cuda_nvrtc # nvrtc.h
-    cuda_nvtx # nvToolsExt.h
+    nvtx # nvToolsExt.h
     cuda_profiler_api # cuda_profiler_api.h
     libcublas # cublas_v2.h
     libcufft # cufft.h

pkgs/development/python-modules/jaxlib/default.nix

@@ -121,7 +121,7 @@ let
       (lib.getDev cuda_cupti) # cupti.h
       (lib.getDev cuda_nvcc) # See https://github.com/google/jax/issues/19811
       (lib.getDev cuda_nvml_dev) # nvml.h
-      (lib.getDev cuda_nvtx) # nvToolsExt.h
+      (lib.getDev nvtx) # nvToolsExt.h
       (lib.getDev libcublas) # cublas_api.h
       (lib.getDev libcufft) # cufft.h
       (lib.getDev libcurand) # curand.h

pkgs/development/python-modules/torch/bin/default.nix

@@ -74,7 +74,7 @@ buildPythonPackage {
     [
       # $out/${sitePackages}/nvfuser/_C*.so wants libnvToolsExt.so.1 but torch/lib only ships
       # libnvToolsExt-$hash.so.1
-      cuda_nvtx
+      nvtx
 
       cuda_cudart
       cuda_cupti

pkgs/development/python-modules/torch/source/default.nix

@@ -609,7 +609,7 @@ buildPythonPackage.override { inherit stdenv; } (finalAttrs: {
       cuda_nvcc # crt/host_config.h; even though we include this in nativeBuildInputs, it's needed here too
       cuda_nvml_dev # <nvml.h>
       cuda_nvrtc
-      cuda_nvtx # -llibNVToolsExt
+      nvtx # -llibNVToolsExt
       libcublas
       libcufft
       libcurand

pkgs/development/python-modules/torchaudio/bin.nix

@@ -49,7 +49,7 @@ buildPythonPackage (finalAttrs: {
 
       # $out/${sitePackages}/torchaudio/lib/libtorchaudio*.so wants libnvToolsExt.so.2 but torch/lib only ships
       # libnvToolsExt-$hash.so.1
-      cuda_nvtx
+      nvtx
     ]
   );
 

pkgs/development/python-modules/transformer-engine/default.nix

@@ -222,7 +222,7 @@ buildPythonPackage.override { stdenv = backendStdenv; } (finalAttrs: {
     cudaPackages.cuda_nvcc # crt/host_config.h; even though we include this in nativeBuildInputs, it's needed here too
     cudaPackages.cuda_nvml_dev # nvml.h
     cudaPackages.cuda_nvrtc # nvrtc.h
-    cudaPackages.cuda_nvtx # nvToolsExt.h
+    cudaPackages.nvtx # nvToolsExt.h
     cudaPackages.cuda_profiler_api # cuda_profiler_api.h
     cudaPackages.cudnn # cudnn.h
     cudaPackages.libcublas

pkgs/development/python-modules/vllm/default.nix

@@ -360,7 +360,7 @@ let
     libcurand # curand_kernel.h
     libcusparse # cusparse.h
     libcusolver # cusolverDn.h
-    cuda_nvtx
+    nvtx
     cuda_nvrtc
     # cusparselt # cusparseLt.h
     libcublas