Skip to content

rocmPackages.llvm: remove workaround for LLVMgold-path.patch#457624

Merged
fabianhjr merged 2 commits intoNixOS:masterfrom
LunNova:push-ysrottxkvwwl
Nov 11, 2025
Merged

rocmPackages.llvm: remove workaround for LLVMgold-path.patch#457624
fabianhjr merged 2 commits intoNixOS:masterfrom
LunNova:push-ysrottxkvwwl

Conversation

@LunNova
Copy link
Copy Markdown
Member

@LunNova LunNova commented Nov 1, 2025

Prior to overrideScope support for llvmPackages, LLVMgold-path.patch would point at a non-overridden LLVM and needed replaced.

Now that we use overrideScope we can drop this jank!

This should hopefully resolve the issue where rocmPackages didn't work with CA derivations.
See also #439003

cc @timschumi

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 6.topic: rocm ROCm is an Advanced Micro Devices software stack for graphics processing unit programming. labels Nov 1, 2025
@timschumi
Copy link
Copy Markdown
Member

cc timschumi

With some incredible timing I wiped my stored ca-derivation build today due to being low on space on my testing machine, so it will take me some time to report back with results.

That said, from looking at just the diff it should solve the issue I had just fine.

Comment thread pkgs/development/rocm-modules/6/llvm/default.nix Outdated
@LunNova
Copy link
Copy Markdown
Member Author

LunNova commented Nov 2, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 457624
Commit: 73b592a7556c6505337412ec0568e636527efed6


x86_64-linux

✅ 91 packages built:
  • adaptivecpp
  • adaptivecppWithCuda
  • adaptivecppWithRocm
  • blender-hip
  • llama-cpp-rocm
  • magma (magma-hip)
  • magma.test (magma-hip.test)
  • ollama-rocm
  • python312Packages.torchWithRocm
  • python312Packages.torchWithRocm.cxxdev
  • python312Packages.torchWithRocm.dev
  • python312Packages.torchWithRocm.dist
  • python312Packages.torchWithRocm.lib
  • python313Packages.torchWithRocm
  • python313Packages.torchWithRocm.cxxdev
  • python313Packages.torchWithRocm.dev
  • python313Packages.torchWithRocm.dist
  • python313Packages.torchWithRocm.lib
  • rocmPackages.aotriton
  • rocmPackages.aotriton.debug
  • rocmPackages.aqlprofile
  • rocmPackages.ck4inductor
  • rocmPackages.ck4inductor.dist
  • rocmPackages.clang (rocmPackages.llvm.clang, rocmPackages.llvm.rocm-toolchain, rocmPackages.rocm-toolchain)
  • rocmPackages.clr
  • rocmPackages.clr.debug
  • rocmPackages.clr.icd
  • rocmPackages.composable_kernel
  • rocmPackages.half
  • rocmPackages.hip-common
  • rocmPackages.hipblas
  • rocmPackages.hipblas-common
  • rocmPackages.hipblaslt
  • rocmPackages.hipblaslt.benchmark
  • rocmPackages.hipcc
  • rocmPackages.hipcub
  • rocmPackages.hipfft
  • rocmPackages.hipfort
  • rocmPackages.hipify
  • rocmPackages.hiprand
  • rocmPackages.hiprt
  • rocmPackages.hipsolver
  • rocmPackages.hipsparse
  • rocmPackages.hsakmt (rocmPackages.rocm-runtime)
  • rocmPackages.hsakmt.debug (rocmPackages.rocm-runtime.debug)
  • rocmPackages.llvm.clang-unwrapped
  • rocmPackages.llvm.clang-unwrapped.debug
  • rocmPackages.llvm.clang-unwrapped.dev
  • rocmPackages.llvm.clang-unwrapped.lib
  • rocmPackages.llvm.clang-unwrapped.python
  • rocmPackages.openmp (rocmPackages.llvm.openmp)
  • rocmPackages.openmp.dev (rocmPackages.llvm.openmp.dev)
  • rocmPackages.stdenv (rocmPackages.rocmClangStdenv)
  • rocmPackages.migraphx
  • rocmPackages.miopen (rocmPackages.miopen-hip)
  • rocmPackages.mivisionx (rocmPackages.mivisionx-hip)
  • rocmPackages.mivisionx-cpu
  • rocmPackages.mpi (rocmPackages.openmpi)
  • rocmPackages.mpi.dev (rocmPackages.openmpi.dev)
  • rocmPackages.mpi.man (rocmPackages.openmpi.man)
  • rocmPackages.mscclpp
  • rocmPackages.rccl
  • rocmPackages.rdc
  • rocmPackages.rdc.doc
  • rocmPackages.rocalution
  • rocmPackages.rocblas
  • rocmPackages.rocdbgapi
  • rocmPackages.rocdbgapi.doc
  • rocmPackages.rocfft
  • rocmPackages.rocgdb
  • rocmPackages.rocm-bandwidth-test
  • rocmPackages.rocm-comgr
  • rocmPackages.rocm-device-libs
  • rocmPackages.rocm-tests
  • rocmPackages.rocminfo
  • rocmPackages.rocmlir (rocmPackages.rocmlir-rock)
  • rocmPackages.rocprim
  • rocmPackages.rocprofiler
  • rocmPackages.rocprofiler-register
  • rocmPackages.rocr-debug-agent
  • rocmPackages.rocrand
  • rocmPackages.rocsolver
  • rocmPackages.rocsparse
  • rocmPackages.rocthrust
  • rocmPackages.roctracer
  • rocmPackages.rocwmma
  • rocmPackages.rpp (rocmPackages.rpp-hip)
  • rocmPackages.rpp-cpu
  • rocmPackages.tensile
  • rocmPackages.tensile.dist
  • zluda

@LunNova LunNova marked this pull request as ready for review November 2, 2025 18:41
Prior to overrideScope support for llvmPackages, LLVMgold-path.patch
would point at a non-overridden LLVM and needed replaced.

Now that we use overrideScope we can drop this patch.
add-nostdlibinc-flag.patch is no longer needed as it was moved to
the cc-wrapper
@nixpkgs-ci nixpkgs-ci Bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 3, 2025
@nixpkgs-ci nixpkgs-ci Bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Nov 11, 2025
@fabianhjr fabianhjr added this pull request to the merge queue Nov 11, 2025
Merged via the queue into NixOS:master with commit 0eae473 Nov 11, 2025
32 of 34 checks passed
hatch01 pushed a commit to hatch01/nixpkgs that referenced this pull request Nov 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: rocm ROCm is an Advanced Micro Devices software stack for graphics processing unit programming. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants