Skip to content

Comments

Meson bump#153082

Closed
AndersonTorres wants to merge 8 commits intoNixOS:stagingfrom
AndersonTorres:meson-bump
Closed

Meson bump#153082
AndersonTorres wants to merge 8 commits intoNixOS:stagingfrom
AndersonTorres:meson-bump

Conversation

@AndersonTorres
Copy link
Member

@AndersonTorres AndersonTorres commented Jan 1, 2022

Motivation for this change

Get rid of old Meson

#144779

As I have said before, the plan is:

  • Insert new Meson in parallel with old one, the older being a safe default (done)
  • Try to force new Meson as default
  • Look at the ofborg logs in order to repair those packages that do not accept new Meson yet
    • Updates should be preferrable
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.

@ofborg ofborg bot added 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package labels Jan 1, 2022
@ofborg ofborg bot requested review from Synthetica9, dotlambda and primeos January 1, 2022 21:02
@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 Jan 1, 2022
@AndersonTorres AndersonTorres mentioned this pull request Jan 1, 2022
11 tasks
Comment on lines +1 to +25
Copy link
Member

Choose a reason for hiding this comment

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

Not a blocker but I hate those refactorings in unrelated commits (it's a bad commit practice). We should either reformat all of Nixpkgs at once or packages individually. A commit like 3d74e57 ("wlroots 0.15: change meson attribute - Meson 0.60 is the default now") shouldn't contain such unrelated changes.

Copy link
Member Author

@AndersonTorres AndersonTorres Jan 1, 2022

Choose a reason for hiding this comment

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

Understandable.
I prefer to do such code refactorings among other things because they did not change the semantics of the code.
Anyway I have splitted the commits in order to reflect this.

Systemd fails to build with new Meson. According to Ofborg logs at

https://gist.github.com/GrahamcOfBorg/d1304f0fc0ed308713303361273522a7

```
meson.build:3:0: ERROR: Unknown options: "cryptsetup, kill-path"
```
A quick and easy rewriting.
wlroots runs whenever wayland runs. Nowadays Wayland is linux-only, however
there are some projects attempting to port it to other Unices. Therefore, it is
better to bind meta.platforms to Wayland.
Meson 0.60 is the default now.
Meson 0.60 is the default now.
Meson 0.60 is the default now.
Meson 0.60 is the default now.
@AndersonTorres AndersonTorres deleted the meson-bump branch January 5, 2022 19:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 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.

2 participants