Skip to content

Comments

qemu: never use bundled Meson#147210

Merged
alyssais merged 1 commit intoNixOS:masterfrom
alyssais:qemu-meson
Nov 25, 2021
Merged

qemu: never use bundled Meson#147210
alyssais merged 1 commit intoNixOS:masterfrom
alyssais:qemu-meson

Conversation

@alyssais
Copy link
Member

Motivation for this change

It's better to fail to build if our version of Meson isn't compatible with QEMU's, so we'll know something is wrong. Otherwise, we'll get subtle breakages that only manifest at runtime, which I think might be what happened in #106988 to necessitate autoPatchelfHook.

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/)
  • 21.11 Release Notes (or backporting 21.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.

It's better to fail to build if our version of Meson isn't compatible
with QEMU's, so we'll know something is wrong.  Otherwise, we'll get
subtle breakages that only manifest at runtime, which I think might be
what happened in 9e403b1 ("qemu: 5.1.0 -> 5.2.0") to necessitate
autoPatchelfHook.
@alyssais alyssais mentioned this pull request Nov 24, 2021
14 tasks
@ofborg ofborg bot requested a review from edolstra November 24, 2021 00:26
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Nov 24, 2021
@alyssais alyssais mentioned this pull request Nov 24, 2021
13 tasks
Copy link
Member

@Artturin Artturin left a comment

Choose a reason for hiding this comment

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

builds

@alyssais alyssais merged commit 5d9e0f8 into NixOS:master Nov 25, 2021
@alyssais alyssais deleted the qemu-meson branch November 25, 2021 19:48
@github-actions
Copy link
Contributor

Successfully created backport PR #147407 for release-21.11.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants