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
vulkan: 1.1.77.0 -> 1.1.82.1 #45195
vulkan: 1.1.77.0 -> 1.1.82.1 #45195
Conversation
|
||
src = fetchFromGitHub { | ||
owner = "KhronosGroup"; | ||
owner = "lenny-lunarg"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why change the source to this fork?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Upstream forked to backport an important bugfix. See KhronosGroup/Vulkan-ValidationLayers#252 for details. The source will be reverted in the next update.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it just one commit?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks that way. Are you thinking incorporating the patch nix-side would be better?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can use the upstream url and fetchpatch
then.
Fixed refs. Annoyingly, upstream didn't tag 1.1.82.1 anywhere, though since it's only a glslang bump all the vulkan-* source is actually unchanged. |
@@ -1,15 +1,15 @@ | |||
{ stdenv, fetchFromGitHub, cmake }: | |||
stdenv.mkDerivation rec { | |||
name = "vulkan-headers-${version}"; | |||
version = "1.1.77.0"; | |||
version = "1.1.82.1"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does it have to be version = "1.1.82.1";
instead of version = "1.1.82.0";
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I could restrict the version change to -validation-layers; would that be preferable?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Keeping version
and rev
in sync looks less confusing to me.
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/vulkan-tools/versions.
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/vulkan-headers/versions.
Reverted to more conservative versioning and switched to fetchpatch for the glslang fix. |
Any hope of getting this in time for the branch? |
@GrahamcOfBorg build vulkan-loader vulkan-validation-layers glslang-git spirv-tools vulkan-headers |
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: vulkan-loader, vulkan-validation-layers, glslang-git, spirv-tools, vulkan-headers Partial log (click to expand)
|
Success on aarch64-linux (full log) Attempted: vulkan-loader, vulkan-validation-layers, spirv-tools, vulkan-headers The following builds were skipped because they don't evaluate on aarch64-linux: glslang-git Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: vulkan-loader, vulkan-validation-layers, spirv-tools, vulkan-headers The following builds were skipped because they don't evaluate on x86_64-linux: glslang-git Partial log (click to expand)
|
Motivation for this change
Lockstep update of all vulkan packages.
Subsumes #45124 and #45125.
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)