Meson: init at 0.60.2#150486
Meson: init at 0.60.2#150486AndersonTorres merged 6 commits intoNixOS:masterfrom AndersonTorres:new-meson
Conversation
ofborg
bot
added
10.rebuild-darwin: 1-10
jtojnar
left a comment
jtojnar
left a comment
There was a problem hiding this comment.
Not really a fan of such megaforks, they tend to be a maintenance nightmare. It would be much cleaner to just overrideAttrs since the majority of the expression remains the same.
pkgs/development/tools/build-managers/meson/0.60/gir-fallback-path.patch
Outdated
Show resolved
Hide resolved
|
I don´t think so. There are patches that needed to be rewritten. Any case, as I have suggested, it will be a matter of "remove old Meson", possibly in a future |
pkgs/development/tools/build-managers/meson/0.60/more-env-vars.patch
Outdated
Show resolved
Hide resolved
Meson is a delicate package. It needs some patches to properly work in Nixpkgs and many packages have it as a dependency, from many small applications to systemd (yay, mass rebuilds in sight!). Updating it is not a trivial and harmless task. Therefore, I took the paranoid way and encapsulate the current version in a subdir, instead of the regular write-over procedure. This way, at the best we can just remove the whole dir in the future, and at the worse we just maintain duplicated code.
A very ugly decision: in order to register the diff between 0.57 and 0.60 releases of Meson in Nixpkgs, I copied the whole directory before actually write it by hand.
Concatenation of lists in Python is done by the `+` operator.
The comment should be self-explaining now.
ofborg
bot
added
11.by: package-maintainer
|
I've marked #144779 as closing this PR. If that's incorrect feel free to remove the "Closes" line from that PR's body. |
|
I feel this partially closes #144779 instead. That being said, I will merge this first. |
|
I wish you'd just merged the other PR — there was nothing more to do, and you asked if anybody objected to it being merged, and nobody said anything. Now merging the other one is even harder because there's a big mess of merge conflicts. |
|
The other PR was more confusing: more than 20 files changed. |
3 participants
Motivation for this change
I found a new Wayland window manager that requires an updated Meson.
But I am a bit afraid of removing the old Meson release. We never know how many bugs and mass rebuilds an innocent new release can generate.
Therefore, I created a new Meson in parallel with the older one.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes