From c1cfcf382285459f793365a1dc56804e08f6c1a3 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Tue, 30 Sep 2025 07:13:42 -0700 Subject: [PATCH] rocmPackages.rocm-path: drop rocm-path shouldn't have been added at top-level. We have a separate non-recursed section containing symlinkJoins for this, and best practice in nixpkgs is to avoid ROCM_PATH when possible and create a minimal one in each package that needs one. --- pkgs/development/rocm-modules/6/default.nix | 8 +++++- .../rocm-modules/6/rocm-path/default.nix | 27 ------------------- 2 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 pkgs/development/rocm-modules/6/rocm-path/default.nix diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix index f43d0852a7ad..49d44ccb9fdd 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/6/default.nix @@ -30,7 +30,6 @@ let buildTests = false; buildBenchmarks = false; - rocmPath = self.callPackage ./rocm-path { }; rocmUpdateScript = self.callPackage ./update.nix { }; ## ROCm ## @@ -417,6 +416,13 @@ let }; } // lib.optionalAttrs config.allowAliases { + rocmPath = throw '' + 'rocm-path' has been removed. If a ROCM_PATH value is required in nixpkgs please + construct one with the minimal set of required deps. + For convenience use outside of nixpkgs consider one of the entries in + 'rocmPackages.meta'. + ''; # Added 2025-09-30 + rocm-merged-llvm = throw '' 'rocm-merged-llvm' has been removed. For 'libllvm' or 'libclang' use 'rocmPackages.llvm.libllvm/clang'. diff --git a/pkgs/development/rocm-modules/6/rocm-path/default.nix b/pkgs/development/rocm-modules/6/rocm-path/default.nix deleted file mode 100644 index 57970ffa4406..000000000000 --- a/pkgs/development/rocm-modules/6/rocm-path/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - symlinkJoin, - linkFarm, - clr, - hipblas, - hipblas-common, - rocblas, - rocsolver, - rocsparse, - rocm-device-libs, - rocm-smi, - llvm, -}: -symlinkJoin { - name = "rocm-path-${clr.version}"; - paths = [ - clr - hipblas-common - hipblas - rocblas - rocsolver - rocsparse - rocm-device-libs - rocm-smi - (linkFarm "rocm-llvm-subdir" { llvm = llvm.clang; }) - ]; -}