From 52eb8850b82e0c3eceafc96fe72c56054fbd0451 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 30 Mar 2024 13:51:22 -0700 Subject: [PATCH] cudaPackages.autoAdd{Driver,OpengGL}Runpath: deprecate --- pkgs/development/cuda-modules/aliases.nix | 16 +++++++++++++++- .../cuda-modules/setup-hooks/extension.nix | 7 ------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/cuda-modules/aliases.nix b/pkgs/development/cuda-modules/aliases.nix index 3c4a791ebd71..36dd07d773bd 100644 --- a/pkgs/development/cuda-modules/aliases.nix +++ b/pkgs/development/cuda-modules/aliases.nix @@ -1,4 +1,18 @@ # Packges which have been deprecated or removed from cudaPackages -final: prev: { +final: prev: +let + mkRenamed = + oldName: newName: newPkg: + final.lib.warn "cudaPackages.${oldName} is deprecated, use ${newName} instead" newPkg; +in +{ + # Deprecated: an alias kept for compatibility. Consider removing after 24.05 + autoFixElfFiles = mkRenamed "autoFixElfFiles" "pkgs.autoFixElfFiles" final.pkgs.autoFixElfFiles; # Added 2024-03-30 + autoAddDriverRunpath = + mkRenamed "autoAddDriverRunpath" "pkgs.autoAddDriverRunpath" + final.pkgs.autoAddDriverRunpath; # Added 2024-03-30 + autoAddOpenGLRunpathHook = + mkRenamed "autoAddOpenGLRunpathHook" "pkgs.autoAddDriverRunpath" + final.pkgs.autoAddDriverRunpath; # Added 2024-03-30 } diff --git a/pkgs/development/cuda-modules/setup-hooks/extension.nix b/pkgs/development/cuda-modules/setup-hooks/extension.nix index c385b4a06797..327f335f1890 100644 --- a/pkgs/development/cuda-modules/setup-hooks/extension.nix +++ b/pkgs/development/cuda-modules/setup-hooks/extension.nix @@ -1,11 +1,4 @@ final: _: { - # TODO: - # - Move to cuda-modules/aliases.nix once - # https://github.com/NixOS/nixpkgs/issues/141803 is ready. - # - Consider removing after 24.11. - inherit (final.pkgs) autoAddDriverRunpath autoFixElfFiles; - autoAddOpenGLRunpathHook = final.autoAddDriverRunpath; - # Internal hook, used by cudatoolkit and cuda redist packages # to accommodate automatic CUDAToolkit_ROOT construction markForCudatoolkitRootHook = final.callPackage (