Skip to content

openmvs: cite the merged upstream fix for the CUDA error patch - #582875

Merged
ConnorBaker merged 1 commit into
NixOS:masterfrom
ConnorBaker:openmvs-cite-upstream-fix
Nov 9, 2026
Merged

ConnorBaker merged 1 commit into
NixOS:masterfrom
ConnorBaker:openmvs-cite-upstream-fix

Conversation

@ConnorBaker

Copy link
Copy Markdown
Contributor

The vendored report-cuda-error-uninit.patch cited cdcseacave/openMVS#1316, which upstream closed in favour of cdcseacave/openMVS#1324 (merged). #1324 fixes the uninitialized CUDA error strings as part of a larger rework, e0ef7ee96f, which does not apply to 2.4.0 (git apply --check fails on all 11 files). So the patch stays, and the comment now cites the merged fix and says to remove the patch on the next release.

Comment-only change: no rebuilds.

AI disclosure: prepared by Claude Code (Claude Opus 5.5) at the author's request.

🤖 Generated with Claude Code

The vendored patch cited cdcseacave/openMVS#1316, which was closed in
favour of NixOS#1324. NixOS#1324 fixes the uninitialized error strings as part of a
larger rework (e0ef7ee96f) that does not apply to 2.4.0, so the patch
stays until the next release.

Assisted-by: Claude Code (Claude Opus 5.5)
@nixpkgs-ci nixpkgs-ci Bot added the 2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". label Nov 3, 2026
@nixpkgs-ci
nixpkgs-ci Bot requested review from MiniHarinn and bouk November 3, 2026 23:45
@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. llm-assisted Contributions that include code generation with LLMs labels Nov 3, 2026
@nixpkgs-ci nixpkgs-ci Bot added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Nov 4, 2026

@MiniHarinn MiniHarinn left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I would recommend stopping vendoring the patch and using fetchpatch instead, since the commit is merged upstream and is self-explanatory.

@ConnorBaker

Copy link
Copy Markdown
Contributor Author

@MiniHarinn upstream's change is a rework, not merging the patch. It doesn't apply cleanly. I was also unable to filter it so it would apply cleanly. The vendored copy is the smallest difference we can maintain unless we want to bump to a commit including the rework instead of sticking to a release.

If you find it's self-explanatory and there's no ambiguity that the patch should be removed when updating, I'm happy to close this!

@MiniHarinn MiniHarinn left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I wouldn't mind having a commit temporary cited here, it will eventually get removed in the next update anyway. LGTM

@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 7, 2026
@ConnorBaker
ConnorBaker added this pull request to the merge queue Nov 9, 2026
Merged via the queue into NixOS:master with commit 1c72156 Nov 9, 2026
43 of 44 checks passed
@ConnorBaker
ConnorBaker deleted the openmvs-cite-upstream-fix branch November 11, 2026 20:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. llm-assisted Contributions that include code generation with LLMs

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants