Skip to content

meson: 0.61.2 -> 0.62.2#178748

Closed
Infinidoge wants to merge 1 commit intoNixOS:masterfrom
Infinidoge:bump/meson
Closed

meson: 0.61.2 -> 0.62.2#178748
Infinidoge wants to merge 1 commit intoNixOS:masterfrom
Infinidoge:bump/meson

Conversation

@Infinidoge
Copy link
Contributor

Description of changes

This updates meson to the latest version, which was necessary for my upcoming PR to bump kmscon to the latest version. Several patches were removed due to being upstreamed.

HOWEVER: This definitely needs feedback, because running the nixpkgs review command below appears to fail, with the error message:

error: Function called without required argument "lzma" at /home/infinidoge/.cache/nixpkgs-review/rev-d55fcf6acf96287efc540014758f67fddbd4dc69/nixpkgs/pkgs/development/libraries/avro-c/default.nix:1, did you mean "lima", "czmq" or "emma"?

(Before that there was a very long list of packages)

I'm unsure what caused this, because the avro-c/default.nix mentions nothing about meson, but thought it worth noting here.

Due to the issue above, notifying maintainers: @jtojnar @AndersonTorres @brandonedens

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.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.

@Infinidoge Infinidoge requested review from AndersonTorres, Mindavi and jtojnar and removed request for Mindavi and jtojnar June 23, 2022 15:18
@Infinidoge Infinidoge added the 8.has: package (update) This PR updates a package to a newer version label Jun 23, 2022
@Infinidoge
Copy link
Contributor Author

I think I may know the issue,
It might be possible that for some reason, this latest meson update conflicts with the fortify hardening, (kmscon and wayland-protocols, which both used meson, threw the same error about FORTIFY_SOURCE)

The issue there being that it seems like it is trying to compile with fortify without including the optimization level.

In both cases of kmscon and wayland-protocols, adding hardeningDisable = [ "fortify" ]; resolves the issue, but doing that tree-wide for meson-built software seems unwise.

@NickCao
Copy link
Member

NickCao commented Jun 23, 2022

lzma is an alias, replacing it with xz should fix the evaluation error.

@ofborg ofborg bot requested a review from jtojnar June 23, 2022 15:56
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jun 23, 2022
@jtojnar
Copy link
Member

jtojnar commented Jun 23, 2022

This would need to go into staging and we already have #171069.

@Mindavi
Copy link
Contributor

Mindavi commented Jun 23, 2022

Please test the other PR and comment on any issues you see.

@Mindavi Mindavi closed this Jun 23, 2022
@Infinidoge
Copy link
Contributor Author

Ah, it seems I didn't see that PR, will retarget accordingly.

@Infinidoge Infinidoge deleted the bump/meson branch June 23, 2022 23:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: package (update) This PR updates a package to a newer version 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants