Skip to content

osl: fix build, 1.12.13.0 -> 1.12.14.0#268670

Merged
pbsds merged 2 commits intoNixOS:masterfrom
ShaddyDC:osl-fix
Nov 27, 2023
Merged

osl: fix build, 1.12.13.0 -> 1.12.14.0#268670
pbsds merged 2 commits intoNixOS:masterfrom
ShaddyDC:osl-fix

Conversation

@ShaddyDC
Copy link
Contributor

Description of changes

Fixes #262633

Changelog is here

Fixed llvm version to 15 because it otherwise fails with an error that 16 is not supported.

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/)
  • 23.11 Release Notes (or backporting 23.05 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.

Pinging maintainers @Hodapp87

Copy link
Member

Choose a reason for hiding this comment

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

not going going to block this PR, is there an upstream issue/PR to track clang 16 support ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wasn't able to find one, but I could open one if that makes things simpler to track

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually, not sure how I missed it, but there is this: AcademySoftwareFoundation/OpenShadingLanguage#1730
Unfortunately, applying the PR directly fails, but I guess it will be in one of the next releases.

@ofborg ofborg bot requested a review from Hodapp87 November 20, 2023 09:57
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Nov 20, 2023
@kirillrdy
Copy link
Member

segfault on darwin. I assume it used to build on darwin because of optional depndency on libxml2

@ShaddyDC
Copy link
Contributor Author

ShaddyDC commented Nov 20, 2023

Hmm, I don't really know how they work or what they're supposed to do, but the binaries seem to work for me on linux with some test files from the repo, or at least they don't crash. I don't have a darwin system to test on, and the maintainer doesn't look to have been active in a while. Maybe @wegank who has added it can take a look?
Otherwise, I guess we could just disable that again so it works on linux at least.

@kirillrdy
Copy link
Member

Hmm, I don't really know how they work or what they're supposed to do, but the binaries seem to work for me on linux with some test files from the repo, or at least they don't crash. I don't have a darwin system to test on, and the maintainer doesn't look to have been active in a while. Maybe @wegank who has added it can take a look?

lets wait at least a few more days, after that, we can just disable darwin

@wegank
Copy link
Member

wegank commented Nov 20, 2023

I'll push a fix.

@pbsds
Copy link
Member

pbsds commented Nov 27, 2023

ZHF #265948
fixes https://hydra.nixos.org/build/241738313
fixes #262633
unblocks #260603

@pbsds pbsds added 0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign backport release-23.11 labels Nov 27, 2023
@pbsds
Copy link
Member

pbsds commented Nov 27, 2023

Result of nixpkgs-review pr 268670 run on x86_64-linux 1

1 package built:
  • osl

LGTM, thanks!

@github-actions
Copy link
Contributor

Successfully created backport PR for release-23.11:

@ShaddyDC ShaddyDC deleted the osl-fix branch November 27, 2023 07:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Build failure: osl

4 participants