Skip to content
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

Merged
merged 6 commits into from Sep 2, 2018
Merged

vulkan: 1.1.77.0 -> 1.1.82.1 #45195

merged 6 commits into from Sep 2, 2018

Conversation

Ralith
Copy link
Contributor

@Ralith Ralith commented Aug 17, 2018

Motivation for this change

Lockstep update of all vulkan packages.

Subsumes #45124 and #45125.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.


src = fetchFromGitHub {
owner = "KhronosGroup";
owner = "lenny-lunarg";
Copy link
Member

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?

Copy link
Contributor Author

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.

Copy link
Member

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?

Copy link
Contributor Author

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?

Copy link
Member

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.

@Ralith
Copy link
Contributor Author

Ralith commented Aug 24, 2018

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";
Copy link
Member

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";?

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 could restrict the version change to -validation-layers; would that be preferable?

Copy link
Member

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.

@Ralith
Copy link
Contributor Author

Ralith commented Aug 30, 2018

Reverted to more conservative versioning and switched to fetchpatch for the glslang fix.

@Ralith
Copy link
Contributor Author

Ralith commented Sep 2, 2018

Any hope of getting this in time for the branch?

@grahamc
Copy link
Member

grahamc commented Sep 2, 2018

@GrahamcOfBorg build vulkan-loader vulkan-validation-layers glslang-git spirv-tools vulkan-headers

@GrahamcOfBorg
Copy link

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)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

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)

shrinking /nix/store/naggjggp6k4pndhjvf62gjbin9ffqysh-vulkan-validation-layers-1.1.82.0/lib/libVkLayer_object_tracker.so
shrinking /nix/store/naggjggp6k4pndhjvf62gjbin9ffqysh-vulkan-validation-layers-1.1.82.0/lib/libVkLayer_core_validation.so
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/naggjggp6k4pndhjvf62gjbin9ffqysh-vulkan-validation-layers-1.1.82.0/lib
patching script interpreter paths in /nix/store/naggjggp6k4pndhjvf62gjbin9ffqysh-vulkan-validation-layers-1.1.82.0
checking for references to /build in /nix/store/naggjggp6k4pndhjvf62gjbin9ffqysh-vulkan-validation-layers-1.1.82.0...
/nix/store/0fyajwrpjsjj1zgavfb0l5hr8p1xmw0k-vulkan-loader-1.1.82.0
/nix/store/naggjggp6k4pndhjvf62gjbin9ffqysh-vulkan-validation-layers-1.1.82.0
/nix/store/slh4ljsgx3hjsvf76kxwd81fjsavrvhs-spirv-tools-2018-07-04
/nix/store/49h8sa1k7zgn44q3awsf7mjp6xsxfnc5-vulkan-headers-1.1.82.0

@GrahamcOfBorg
Copy link

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)

shrinking /nix/store/2w8h9y2a9lygd7shdazsk62k2vyvrsh0-vulkan-validation-layers-1.1.82.0/lib/libVkLayer_object_tracker.so
shrinking /nix/store/2w8h9y2a9lygd7shdazsk62k2vyvrsh0-vulkan-validation-layers-1.1.82.0/lib/libVkLayer_parameter_validation.so
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/2w8h9y2a9lygd7shdazsk62k2vyvrsh0-vulkan-validation-layers-1.1.82.0/lib
patching script interpreter paths in /nix/store/2w8h9y2a9lygd7shdazsk62k2vyvrsh0-vulkan-validation-layers-1.1.82.0
checking for references to /build in /nix/store/2w8h9y2a9lygd7shdazsk62k2vyvrsh0-vulkan-validation-layers-1.1.82.0...
/nix/store/jj0ja5p1sfcl8rqnfvcchaygrg3wwa6d-vulkan-loader-1.1.82.0
/nix/store/2w8h9y2a9lygd7shdazsk62k2vyvrsh0-vulkan-validation-layers-1.1.82.0
/nix/store/89vr7fygnhh7ibkkqx03mckgnrp55cwb-spirv-tools-2018-07-04
/nix/store/aysxshfzf9a8xy13mnflpcc0pz4z2ssb-vulkan-headers-1.1.82.0

@grahamc grahamc merged commit 121a7d7 into NixOS:master Sep 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants