Skip to content

shader-slang: 2025.8.1 -> 2025.12.1 #424153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 11, 2025

Conversation

samestep
Copy link
Contributor

@samestep samestep commented Jul 10, 2025

Upgrades shader-slang from 2025.8.1 to 2025.12.1

This PR fixes up #416790 by applying the updated patch mentioned in #424144, and then "resolves" the reference cycle error by having the derivation be single-output; this was the only fix I could figure out at the moment with my limited Nix expertise. I don't have a good understanding of what the drawbacks are.

Changelogs:

cc @niklaskorz

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/)
  • Nixpkgs 25.11 Release Notes (or backporting 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 25.05 NixOS Release notes)
    • (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, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@samestep samestep requested a review from niklaskorz July 10, 2025 21:14
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 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 This PR causes 1 package to rebuild on Linux. labels Jul 10, 2025
@niklaskorz
Copy link
Contributor

Thank you a lot for fixing the patches! I'll have a look into the circular reference issue, as I'd prefer keeping the separate outputs :)

@niklaskorz niklaskorz force-pushed the shader-slang-2025.12.1 branch from 0df4540 to a073be5 Compare July 11, 2025 09:46
@niklaskorz
Copy link
Contributor

The cyclic dependency was caused by cmake/ being contained in $out, which referenced headers in $dev, while $dev references $out as propagated build input.

The solution was moving cmake/ to $dev, as the cmake definitions are only ever needed as development input.

@niklaskorz
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 424153
Commit: a073be5064d11fd8a86136c564603c96b284d2e7


x86_64-linux

✅ 4 packages built:
  • shader-slang
  • shader-slang.debug
  • shader-slang.dev
  • shader-slang.doc

@niklaskorz
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 424153
Commit: a073be5064d11fd8a86136c564603c96b284d2e7


aarch64-darwin

✅ 3 packages built:
  • shader-slang
  • shader-slang.dev
  • shader-slang.doc

@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 Jul 11, 2025
@niklaskorz niklaskorz merged commit bad3ecf into NixOS:master Jul 11, 2025
25 of 29 checks passed
@samestep samestep deleted the shader-slang-2025.12.1 branch July 11, 2025 12:09
@samestep
Copy link
Contributor Author

Thanks @niklaskorz for fixing and merging this!

As a heads up, this package will need to be manually fixed again for the next Slang release, due to shader-slang/slang#7577 (the build still succeeds on the previous commit shader-slang/slang@00746bf).

I'm wondering whether it would make sense to try to upstream any of this into the Slang repo; also cc @expipiplus1 who maintains her own Slang flake.nix but has limited bandwidth at the moment.

@niklaskorz
Copy link
Contributor

Thanks @niklaskorz for fixing and merging this!

As a heads up, this package will need to be manually fixed again for the next Slang release, due to shader-slang/slang#7577 (the build still succeeds on the previous commit shader-slang/slang@00746bf).

I'm wondering whether it would make sense to try to upstream any of this into the Slang repo; also cc @expipiplus1 who maintains her own Slang flake.nix but has limited bandwidth at the moment.

Yeah we should definitely upstream these patches, they are breaking too often to maintain them in nixpkgs I'm afraid.

@samestep
Copy link
Contributor Author

@niklaskorz the Slang repo currently has a flake.nix which just holds a devShell; would you have any interest in opening a PR adding a defaultPackage for nix build by using (some of?) the setup/patches already in Nixpkgs? Or what do you think may be the best way to go about this?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants