Skip to content

spirv-llvm-translator: fix duplicate makeFlags merge#171787

Closed
calbrecht wants to merge 1 commit intoNixOS:staging-nextfrom
calbrecht:staging-fix-spirv-llvm-translator
Closed

spirv-llvm-translator: fix duplicate makeFlags merge#171787
calbrecht wants to merge 1 commit intoNixOS:staging-nextfrom
calbrecht:staging-fix-spirv-llvm-translator

Conversation

@calbrecht
Copy link
Member

Description of changes

See
#171656 (comment)

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

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.

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
Copy link
Member Author

This is bad, i messed up.

@calbrecht calbrecht closed this May 6, 2022
@ofborg ofborg bot requested a review from gloaming May 6, 2022 09:24
@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 6, 2022
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-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant