Skip to content

Comments

intel-compute-runtime: 21.42.21270 -> 22.17.23034#171656

Merged
lovesegfault merged 4 commits intoNixOS:masterfrom
rowanG077:igm-vnext
May 5, 2022
Merged

intel-compute-runtime: 21.42.21270 -> 22.17.23034#171656
lovesegfault merged 4 commits intoNixOS:masterfrom
rowanG077:igm-vnext

Conversation

@rowanG077
Copy link
Member

@rowanG077 rowanG077 commented May 5, 2022 •
edited
Loading

Description of changes

intel-compute-runtime is currently broken. Fixes #169729

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.05 Release Notes (or backporting 21.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@rowanG077 rowanG077 mentioned this pull request May 5, 2022
Closed
@ofborg ofborg bot requested a review from gloaming May 5, 2022 13:06
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 5, 2022
@lovesegfault lovesegfault merged commit 9599712 into NixOS:master May 5, 2022
wentasah
wentasah reviewed May 5, 2022
View reviewed changes
Copy link
Contributor

@wentasah wentasah left a comment

Choose a reason for hiding this comment

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

This works for me. I have a few minor comments below.

(aaah, too late :-)

calbrecht
calbrecht reviewed May 5, 2022
View reviewed changes
Copy link
Member

@calbrecht calbrecht left a comment

Choose a reason for hiding this comment

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

Works as intended i guess :) Similar to what i have seen with my changes, the tearing after reboot is gone, thats a good sign 👍

@lovesegfault lovesegfault mentioned this pull request May 5, 2022
Merged
13 tasks
@ivan
Copy link
Member

ivan commented May 6, 2022

there was a conflict with #162603 and a GitHub Action did a bad merge in 4cab9ae#diff-1aeab0da45b3afb6688d321042021a2ebad96758fc495d92aaadb50cc9aa22c7R28, adding a second makeFlags and breaking the build.

@rowanG077
Copy link
Member Author

rowanG077 commented May 6, 2022

@ivan The new makeFlags aren't in master now. Do you want me to take action?

@ivan
Copy link
Member

ivan commented May 6, 2022

I am pointing out that pkgs/development/compilers/spirv-llvm-translator/default.nix has two makeFlags in staging, which nix does not accept :) I haven't looked into how to resolve the conflict and I am not a committer.

calbrecht added a commit to calbrecht/nixpkgs that referenced this pull request May 6, 2022
@calbrecht
spirv-llvm-translator: fix duplicate makeFlags merge
9d8bbb5 
See
NixOS#171656 (comment)

there was a conflict with NixOS#162603 and a GitHub Action did a bad merge in 4cab9ae#diff-1aeab0da45b3afb6688d321042021a2ebad96758fc495d92aaadb50cc9aa22c7R28, adding a second makeFlags and breaking the build.
@calbrecht calbrecht mentioned this pull request May 6, 2022
Closed
calbrecht added a commit to calbrecht/nixpkgs that referenced this pull request May 6, 2022
@calbrecht
spirv-llvm-translator: fix duplicate makeFlags merge
ee9d67e 
See
NixOS#171656 (comment)

there was a conflict with NixOS#162603 and a GitHub Action did a bad merge in 4cab9ae#diff-1aeab0da45b3afb6688d321042021a2ebad96758fc495d92aaadb50cc9aa22c7R28, adding a second makeFlags and breaking the build.
@calbrecht calbrecht mentioned this pull request May 6, 2022
Closed
13 tasks
calbrecht added a commit to calbrecht/nixpkgs that referenced this pull request May 6, 2022
@calbrecht
spirv-llvm-translator: fix duplicate makeFlags merge
a8b6a74 
See
NixOS#171656 (comment)

there was a conflict with NixOS#162603 and a GitHub Action did a bad merge in 4cab9ae#diff-1aeab0da45b3afb6688d321042021a2ebad96758fc495d92aaadb50cc9aa22c7R28, adding a second makeFlags and breaking the build.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lovesegfault lovesegfault lovesegfault left review comments

@gloaming gloaming Awaiting requested review from gloaming

+2 more reviewers

@wentasah wentasah wentasah left review comments

@calbrecht calbrecht calbrecht left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

intel-graphics-compiler is not being fetched from the cache and the compilation fails

5 participants

@rowanG077 @ivan @wentasah @calbrecht @lovesegfault