cudatoolkit: Replace vendored Qt plugins with symlinks#271923
Merged
ConnorBaker merged 1 commit intoNixOS:masterfrom Dec 13, 2023
Merged
cudatoolkit: Replace vendored Qt plugins with symlinks#271923ConnorBaker merged 1 commit intoNixOS:masterfrom
ConnorBaker merged 1 commit intoNixOS:masterfrom
Conversation
graham33
commented
Dec 3, 2023
ofborg
bot
added
10.rebuild-darwin: 11-100
samuela
previously requested changes
Dec 4, 2023
Contributor
|
Verified that this fixes #232458. Thanks! Excited to start using this. |
Contributor
Author
|
I think I fixed the indentation, but it's possible I made it worse :) PTAL |
Contributor
|
@graham33 sorry about the merge conflicts! I just merged #256324. The file you'll want to edit now is https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/cuda-modules/cudatoolkit/default.nix. |
This resolves crashes in nsys-ui
Contributor
Author
Should be sorted now, hopefully! |
ofborg
bot
added
10.rebuild-darwin: 0
Contributor
|
Note Template PR=271923; \
SYSTEM="aarch64-linux"; \
CUDA_SUPPORT="true"; \
CUDA_CAPABILITIES='[ "7.5" ]'; \
nixpkgs-review pr "$PR" \
--system "$SYSTEM" \
--no-shell \
--checkout commit \
--allow aliases \
--build-args "--max-jobs 1" \
--extra-nixpkgs-config "{
allowUnfree = true;
allowBroken = false;
cudaSupport = ${CUDA_SUPPORT:-false};
cudaCapabilities = ${CUDA_CAPABILITIES:-[]};
}"
|
ConnorBaker
dismissed
samuela’s stale review
Requested changes have been made
13 tasks
Contributor
|
I don't see anything concerning in the derivations which don't build, so I'm merging this. Thank you, Graham! |
ConnorBaker
approved these changes
Dec 13, 2023
Contributor
Author
Great thanks! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This resolves crashes in nsys-ui
Description of changes
Although we remove most of the vendored Qt libraries in cudatoolkit (and use patchelf to ensure the Nix versions are picked up), there are still quite a lot of Qt plugin libraries that remain. These appear to be causing the
nsys-uicrashes reported in #232458 due to binary compatibility issues.Fixes #232458
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.