Skip to content

Update nixpkgs - #130

Merged
danieldk merged 14 commits into
mainfrom
bump-nixpkgs-20251104
Nov 7, 2025
Merged

Update nixpkgs#130
danieldk merged 14 commits into
mainfrom
bump-nixpkgs-20251104

Conversation

@danieldk

@danieldk danieldk commented Nov 6, 2025

Copy link
Copy Markdown
Member

This PR updates nixpkgs so that we can get the macOS 26 SDK in kernel-builder. As usual, there are a bunch of changes:

  • Remove our own cudaPackages fork. We don't have to support CUDA 11.8 anymore and our fork was diverging in terms of outputs, etc.
  • Remove our own gcc fork, since we do not need the old gcc versions anymore for old CUDA versions.
  • Sync aotriton with upstream, but with a twist: use precompiled kernel images (to avoid 4x FA3-like compile times).
  • Make torch-bin the default Torch.
  • Remove triton-rocm, we don't need it anymore because all the fixes are upstreamed.
  • Relax triton-xpu CMake bound (it is newer than the version bound in triton-xpu).
  • Fix an issue in torch-bin where we were not correctly removing the aotorch library (since we want to link against our own build).

Tested with kernel-builder (+ some changes).

All the changes (like patching up the linker path) are in the main
triton derivation.
Let's try to hop on the upstream CUDA packages again. We started
diverging a lot (e.g. upstream added "include" outputs to the CUDA
packages) and we do not need CUDA 11.8 anymore since dropping
Torch 2.7.
Sync the derivation (mostly) with nixpkgs. Use pre-compiled kernel
images to speed up the build.
drbh
drbh previously approved these changes Nov 6, 2025

@drbh drbh left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

woah haha awesome pr!

a bit hard to review but the removed files and new additions look reasonable.

LGTM pending green CI!

MekkCyber
MekkCyber previously approved these changes Nov 7, 2025

@MekkCyber MekkCyber left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Amazing cleanup 🔥 !

What is so different about cuda 11.8 that we had to keep our own version ?

Needed for compatibility with tokenizers.
@danieldk
danieldk dismissed stale reviews from MekkCyber and drbh via 61d374b November 7, 2025 08:33
@danieldk

danieldk commented Nov 7, 2025

Copy link
Copy Markdown
Member Author

What is so different about cuda 11.8 that we had to keep our own version ?

CUDA < 12 required a lot of additional conditionals and they were not there anymore since upstream dropped support for old CUDA versions.

@danieldk
danieldk merged commit 3267e73 into main Nov 7, 2025
1 check passed
@danieldk
danieldk deleted the bump-nixpkgs-20251104 branch November 7, 2025 08:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants