-
-
Notifications
You must be signed in to change notification settings - Fork 14k
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
[staging] ninja: 1.11.1 -> 1.12.1 #303416
Conversation
d2e28a9
to
953c32d
Compare
@NickCao ofborg eval is failing, even after multiple rebase. I can't seem to figure out what's wrong from the logs. I can successfully build locally and using ofborg here though. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Skimmed through upstream diff, LGTM. Running nixpkgs-review.
@ofborg eval |
This seems to somehow break meson. |
Should be fixed by mesonbuild/meson@1b9eb6f |
Should I make a PR to fetch the referenced commit as a patch to |
Just add that to this PR. |
Looks like coreutils is failing at checkPhase when building meson.
|
Hard to tell from just this sumary but if this a Musl & coreutils thing see #304856 |
@LeSuisse Looks like this exact test is failing. From |
@ofborg test coreutils |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
error: hash mismatch in fixed-output derivation '/nix/store/13zfv027g2bzjdwkcra1f2a72ap59md0-allow-building-with-ninja-1.12.diff.drv':
specified: sha256-2rlIQHXGox2eeDzqZQz1TYYUqLDhrDqGXHusM8y6+LY=
got: sha256-Y+uEXomtYcLQ8tXnopceh/ZGUpYCSc6oJUkbyRpg9HY=
I see you used hash for the file before fetchpatch
edited it (which is the difference from fetchurl
).
cfc81b7
to
4d39c7e
Compare
Remove patch for files in large fs, since it is merged to v1.12.0
add nix-update-script move to finalAttrs
@vcunat since 24.05 have been branched-off already, I guess it's time to move this PR forward? |
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/prs-ready-for-review/3032/3981 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, meson
builds for me. News best at: https://github.com/ninja-build/ninja/releases
Description of changes
ninja
topkgs/by-name
Current meson version can not be built using ninja 1.12, so use a patch from upstream (mesonbuild/meson@1b9eb6f) to allow building meson.
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.