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.

Sign up for GitHub

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

Jump to bottom

vulkan-loader: 1.0.61.1 -> 1.1.70.0 #37684

Merged
merged 1 commit into from Apr 4, 2018
Merged

vulkan-loader: 1.0.61.1 -> 1.1.70.0 #37684

merged 1 commit into from Apr 4, 2018

Conversation

Ralith
Copy link
Contributor

@Ralith Ralith commented Mar 23, 2018

Lockstep glslang and spirv-tools updates included.

These packages are getting progressively more annoying to manage. I tried to update shaderc while I was at it, but it seems like it requires a different set of seemingly arbitrary revisions of spirv-tools, so I'm leaving it broken for now. Might be best to give up on reusing the standalone spirv-tools package; it's not like glslang or shaderc make any effort to reuse existing build products anyway.

Motivation for this change

This allows development of Vulkan 1.1 applications with Nix.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@Ralith
vulkan-loader: 1.0.61.1 -> 1.1.70.0
3808369 
Lockstep glslang and spirv-tools updates included
@Mic92
Copy link
Member

Mic92 commented Mar 24, 2018

Should mark this as broken then?
@GrahamcOfBorg build shaderc

@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: shaderc

Partial log (click to expand)


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

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

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: shaderc

Partial log (click to expand)


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

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

@Mic92
Copy link
Member

Mic92 commented Mar 24, 2018

@GrahamcOfBorg build vulkan-loader

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: shaderc

Partial log (click to expand)


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

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

@Mic92
Copy link
Member

Mic92 commented Mar 24, 2018

ah it is already.

@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

Partial log (click to expand)


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

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

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: vulkan-loader

Partial log (click to expand)

checking for references to /build in /nix/store/dy9bxwlb2hwjsyfm4cnfqdz1sdq8gyfn-vulkan-loader-1.1.70.0-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/zfkdhy8ilr6jvrq1vq6676lqrd8zs2cl-vulkan-loader-1.1.70.0-demos
shrinking /nix/store/zfkdhy8ilr6jvrq1vq6676lqrd8zs2cl-vulkan-loader-1.1.70.0-demos/bin/.cubepp-wrapped
shrinking /nix/store/zfkdhy8ilr6jvrq1vq6676lqrd8zs2cl-vulkan-loader-1.1.70.0-demos/bin/.cube-wrapped
shrinking /nix/store/zfkdhy8ilr6jvrq1vq6676lqrd8zs2cl-vulkan-loader-1.1.70.0-demos/bin/smoketest
strip is /nix/store/3zq400fri5dv7d30lpxlqm2v9y1iis6j-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/zfkdhy8ilr6jvrq1vq6676lqrd8zs2cl-vulkan-loader-1.1.70.0-demos/bin
patching script interpreter paths in /nix/store/zfkdhy8ilr6jvrq1vq6676lqrd8zs2cl-vulkan-loader-1.1.70.0-demos
checking for references to /build in /nix/store/zfkdhy8ilr6jvrq1vq6676lqrd8zs2cl-vulkan-loader-1.1.70.0-demos...
/nix/store/j0149rsq9h97f9s4w68b2mpj3nwl5jji-vulkan-loader-1.1.70.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: vulkan-loader

Partial log (click to expand)

checking for references to /build in /nix/store/zqm3pxn9wf9bki4k6yx4aqxn9smx0791-vulkan-loader-1.1.70.0-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/ss8y0wsr3whl9ylrz9m8map30i0vqi0h-vulkan-loader-1.1.70.0-demos
shrinking /nix/store/ss8y0wsr3whl9ylrz9m8map30i0vqi0h-vulkan-loader-1.1.70.0-demos/bin/.cube-wrapped
shrinking /nix/store/ss8y0wsr3whl9ylrz9m8map30i0vqi0h-vulkan-loader-1.1.70.0-demos/bin/.cubepp-wrapped
shrinking /nix/store/ss8y0wsr3whl9ylrz9m8map30i0vqi0h-vulkan-loader-1.1.70.0-demos/bin/smoketest
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/ss8y0wsr3whl9ylrz9m8map30i0vqi0h-vulkan-loader-1.1.70.0-demos/bin
patching script interpreter paths in /nix/store/ss8y0wsr3whl9ylrz9m8map30i0vqi0h-vulkan-loader-1.1.70.0-demos
checking for references to /build in /nix/store/ss8y0wsr3whl9ylrz9m8map30i0vqi0h-vulkan-loader-1.1.70.0-demos...
/nix/store/7f7yxwc04a3f4a2y5284i0lg2bp8ja0d-vulkan-loader-1.1.70.0

@Ralith
Copy link
Contributor Author

Ralith commented Apr 2, 2018

Is this blocked?

@Mic92 Mic92 merged commit 1ba44cc into NixOS:master Apr 4, 2018
@Mic92
Copy link
Member

Mic92 commented Apr 4, 2018

No, I just forgot about it.

@Ralith Ralith deleted the vulkan branch April 4, 2018 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Ralith @Mic92 @GrahamcOfBorg @matthewbauer