Skip to content

opensubdiv: use cuda_nvcc only if cudaSupport#272964

Merged
ConnorBaker merged 1 commit intomasterfrom
pr/opensubdiv_no_cuda
Dec 11, 2023
Merged

opensubdiv: use cuda_nvcc only if cudaSupport#272964
ConnorBaker merged 1 commit intomasterfrom
pr/opensubdiv_no_cuda

Conversation

@veprbl
Copy link
Member

@veprbl veprbl commented Dec 8, 2023

Description of changes

Prevents blender from becoming unfree #272559

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Copy link
Contributor

@SomeoneSerge SomeoneSerge left a comment

Choose a reason for hiding this comment

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

Oh-oh please merge asap

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Dec 8, 2023
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Dec 8, 2023
@ofborg ofborg bot requested a review from edolstra December 8, 2023 22:43
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Dec 8, 2023
@Scrumplex Scrumplex 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 Dec 10, 2023
@delroth delroth added 12.approvals: 3+ This PR was reviewed and approved by three or more persons. and removed 12.approvals: 2 This PR was reviewed and approved by two persons. labels Dec 11, 2023
@amarshall amarshall mentioned this pull request Dec 11, 2023
13 tasks
@github-actions
Copy link
Contributor

Backport failed for release-23.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-23.11
git worktree add -d .worktree/backport-272964-to-release-23.11 origin/release-23.11
cd .worktree/backport-272964-to-release-23.11
git switch --create backport-272964-to-release-23.11
git cherry-pick -x 3b2e32b5117e3da6fa3de1c8b67f9bf6660095b7

@wegank wegank deleted the pr/opensubdiv_no_cuda branch January 3, 2024 04:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: cuda Parallel computing platform and API 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 3+ This PR was reviewed and approved by three or more persons.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

7 participants