Skip to content

[staging] ninja: 1.11.1 -> 1.12.1#303416

Merged
vcunat merged 4 commits intoNixOS:stagingfrom
JohnRTitor:ninja
May 25, 2024
Merged

[staging] ninja: 1.11.1 -> 1.12.1#303416
vcunat merged 4 commits intoNixOS:stagingfrom
JohnRTitor:ninja

Conversation

@JohnRTitor
Copy link
Member

@JohnRTitor JohnRTitor commented Apr 11, 2024 •
edited
Loading

Description of changes

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

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@JohnRTitor JohnRTitor force-pushed the ninja branch 6 times, most recently from d2e28a9 to 953c32d Compare April 12, 2024 14:21
NickCao
NickCao reviewed Apr 12, 2024
View reviewed changes
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Apr 13, 2024
@JohnRTitor
Copy link
Member Author

JohnRTitor commented Apr 14, 2024

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

NickCao
NickCao reviewed Apr 14, 2024
View reviewed changes
Copy link
Member

@NickCao NickCao left a comment •
edited
Loading

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.

@NickCao
Copy link
Member

NickCao commented Apr 14, 2024

@ofborg eval

@NickCao
Copy link
Member

NickCao commented Apr 17, 2024

This seems to somehow break meson.

@NickCao
Copy link
Member

NickCao commented Apr 17, 2024

This seems to somehow break meson.

Should be fixed by mesonbuild/meson@1b9eb6f

@JohnRTitor
Copy link
Member Author

JohnRTitor commented Apr 17, 2024

Should be fixed by mesonbuild/meson@1b9eb6f

Should I make a PR to fetch the referenced commit as a patch to meson? Should allow building it I believe.

@NickCao
Copy link
Member

NickCao commented Apr 17, 2024

Should I make a PR to fetch the referenced commit as a patch to meson? Should allow building it I believe.

Just add that to this PR.

@JohnRTitor
Copy link
Member Author

JohnRTitor commented Apr 18, 2024 •
edited
Loading

Looks like coreutils is failing at checkPhase when building meson.

============================================================================
Testsuite summary for GNU coreutils 9.5
============================================================================
# TOTAL: 653
# PASS:  486
# SKIP:  166
# XFAIL: 0
# FAIL:  1
# XPASS: 0
# ERROR: 0
============================================================================
See ./tests/test-suite.log
Please report to bug-coreutils@gnu.org
============================================================================
make[4]: *** [Makefile:22562: tests/test-suite.log] Error 1
make[4]: Leaving directory '/build/coreutils-9.5'
make[3]: *** [Makefile:22670: check-TESTS] Error 2
make[3]: Leaving directory '/build/coreutils-9.5'
make[2]: *** [Makefile:22930: check-am] Error 2
make[2]: Leaving directory '/build/coreutils-9.5'
make[1]: *** [Makefile:22447: check-recursive] Error 1
make[1]: Leaving directory '/build/coreutils-9.5'
make: *** [Makefile:22932: check] Error 2

@JohnRTitor
Copy link
Member Author

JohnRTitor commented Apr 18, 2024

Likely because of recent update to 9.5. #299945

Pinging @LeSuisse @dasJ

@LeSuisse
Copy link
Member

LeSuisse commented Apr 18, 2024

Hard to tell from just this sumary but if this a Musl & coreutils thing see #304856

@JohnRTitor
Copy link
Member Author

JohnRTitor commented Apr 18, 2024 •
edited
Loading

Hard to tell from just this sumary but if this a Musl & coreutils thing see #304856

FAIL: tests/shred/shred-exact.sh
# XFAIL: 0
# FAIL:  1
FAIL: tests/shred/shred-exact
FAIL tests/shred/shred-exact.sh (exit status: 1)
# XFAIL: 0
# FAIL:  1

@LeSuisse Looks like this exact test is failing. From nix log /nix/store/00zxacigf1pws8gpzyqj13gwjy69va64-coreutils-9.5.drv | grep FAIL | less

@JohnRTitor
Copy link
Member Author

JohnRTitor commented Apr 19, 2024

@ofborg test coreutils

vcunat
vcunat requested changes Apr 22, 2024
View reviewed changes
Copy link
Member

@vcunat vcunat left a 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).

@ofborg ofborg bot requested a review from AndersonTorres May 10, 2024 20:12
@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. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels May 10, 2024
AndersonTorres
AndersonTorres reviewed May 10, 2024
View reviewed changes
@JohnRTitor JohnRTitor force-pushed the ninja branch 2 times, most recently from cfc81b7 to 4d39c7e Compare May 13, 2024 06:01
@JohnRTitor JohnRTitor changed the title [staging] ninja: 1.11.1 -> 1.12.0 [staging] ninja: 1.11.1 -> 1.12.1 May 13, 2024
@JohnRTitor
ninja: 1.12.0 -> 1.12.1
c0bb6f9 
add nix-update-script
move to finalAttrs
@JohnRTitor
Copy link
Member Author

JohnRTitor commented May 13, 2024

@ofborg eval
@ofborg build ninja
@ofborg build meson

@JohnRTitor JohnRTitor mentioned this pull request May 22, 2024
Closed
@JohnRTitor JohnRTitor requested a review from vcunat May 23, 2024 19:30
@JohnRTitor
Copy link
Member Author

JohnRTitor commented May 23, 2024

@vcunat since 24.05 have been branched-off already, I guess it's time to move this PR forward?

@nixos-discourse
Copy link

nixos-discourse commented May 24, 2024

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

vcunat
vcunat approved these changes May 25, 2024
View reviewed changes
Copy link
Member

@vcunat vcunat left a 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

@vcunat vcunat merged commit 9d9c87e into NixOS:staging May 25, 2024
@JohnRTitor JohnRTitor deleted the ninja branch May 25, 2024 07:14
@reckenrode reckenrode mentioned this pull request May 30, 2024
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@NickCao NickCao NickCao left review comments

@vcunat vcunat vcunat approved these changes

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

@bjornfor bjornfor Awaiting requested review from bjornfor

@orivej-nixos orivej-nixos Awaiting requested review from orivej-nixos

@adevress adevress Awaiting requested review from adevress

@prusnak prusnak Awaiting requested review from prusnak

@AndersonTorres AndersonTorres Awaiting requested review from AndersonTorres

@cpages cpages Awaiting requested review from cpages

Assignees

No one assigned

Labels

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-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@JohnRTitor @NickCao @LeSuisse @vcunat @nixos-discourse @AndersonTorres