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

qcoro: 0.4.0 -> 0.6.0 and AArch64 fix #196047

Merged
merged 3 commits into from
Oct 18, 2022

Conversation

samueldr
Copy link
Member

@samueldr samueldr commented Oct 14, 2022

Description of changes

Alternative for #185191. I preferred opening a new PR instead of "rudely" changing the semantics of the other PR.

See #185191 (comment)

The TLDR is it is also fixing the packages using qcoro, otherwise they still wouldn't build even though qcoro itself would build. Also changed the fix to use gcc11Stdenv, as suggested by @SuperSandro2000 here.

Things done

I tested with #193858, on x86_64 and AArch64, native builds for both.

  • 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.11 Release Notes (or backporting 22.05 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.

Closes #185191

puffnfresh and others added 3 commits October 14, 2022 15:47
And fix compilation on aarch64 by using gcc11Stdenv.

Co-authored-by: Samuel Dionne-Riel <samuel@dionne-riel>
@samueldr samueldr changed the title Fix/qcoro 0.6 aarch64 alt qcoro: 0.4.0 > 0.6.0 and AArch64 fix Oct 14, 2022
@samueldr samueldr changed the title qcoro: 0.4.0 > 0.6.0 and AArch64 fix qcoro: 0.4.0 -> 0.6.0 and AArch64 fix Oct 14, 2022
@ofborg ofborg bot added 8.has: clean-up 8.has: package (new) This PR adds a new package labels Oct 14, 2022
@ofborg ofborg bot requested review from syvb and peterhoeg October 14, 2022 20:06
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 labels Oct 14, 2022
@samueldr
Copy link
Member Author

samueldr commented Oct 18, 2022

Note that while this PR is only 3 days old, the original comment describing this alternative was written 27 days ago.

Since this is used only by Plasma Mobile Gear packages (neochat I believe started as a Plasma Mobile project), this shouldn't cause any issues in things I'm not involved with.

@samueldr samueldr merged commit b532957 into NixOS:master Oct 18, 2022
@samueldr samueldr deleted the fix/qcoro-0.6-aarch64-alt branch October 18, 2022 05:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants