Skip to content
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.

Sign up for GitHub

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

Jump to bottom

git: 2.18.0 -> 2.19.0 #46723

Merged
merged 1 commit into from Sep 18, 2018
Merged

git: 2.18.0 -> 2.19.0 #46723

merged 1 commit into from Sep 18, 2018

Conversation

thefloweringash
Copy link
Member

Motivation for this change

Package update. PR is based on and aimed at staging due to the large number of packages affected.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@xeji xeji requested a review from dtzWill September 16, 2018 09:20
@dtzWill
Copy link
Member

dtzWill commented Sep 16, 2018

LGTM.

I too saw the t5562 failure, and with your patchshebang this seems to work for me--and when using musl.

I'd like to re-confirm all the test special-cases for musl but I can't do that right away and can submit any changes in a later PR when I get to it.

Thanks!

@xeji
Copy link
Contributor

xeji commented Sep 17, 2018

@GrahamcOfBorg build gitAndTools.gitFull

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: gitAndTools.gitFull

Partial log (click to expand)

Files=827, Tests=19525, 252 wallclock secs ( 5.76 usr  0.96 sys + 341.91 cusr 322.32 csys = 670.95 CPU)
Result: PASS
make clean-except-prove-cache
make[2]: Entering directory '/build/git-2.19.0/t'
rm -f -r 'chainlinttmp'
rm -f -r 'trash directory'.* 'test-results'
rm -f -r valgrind/bin
make[2]: Leaving directory '/build/git-2.19.0/t'
make[1]: Leaving directory '/build/git-2.19.0/t'
/nix/store/byxwipj3449gd5df7v1bamgpd1ldwvx2-git-2.19.0

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-darwin (full log)

Attempted: gitAndTools.gitFull

Partial log (click to expand)

cannot build derivation '/nix/store/lb8frjx9g83xs2pjb8pnsm5hr0n9gcr1-libX11-1.6.6.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/0d4qsqimh4na14kw86c54l428x1sg0gj-opensp-1.5.2.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/46bsa2izp9na0bshjp3dwhva5a5ny6pc-serf-1.3.9.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/w1flq601vm8kgfij2724l6k44ki3gnd0-docbook2X-0.8.8.drv': 13 dependencies couldn't be built
cannot build derivation '/nix/store/w3487h28mkdlk5n0dzpszlgd4qpb2jx0-libXrender-0.9.10.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/8hhjr681hb0y2vfkxfhq5szjl5yfm9di-subversion-1.10.2.drv': 12 dependencies couldn't be built
cannot build derivation '/nix/store/56qy9bhngj8yr5j15xf46sw06icy9d1l-libXft-2.3.2.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/npzvxwqk2qd81ib83p2l29gdwps3751w-tk-8.6.6.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/jl1a62krzychi3qcw5zj7ky61cf2gagm-git-2.19.0.drv': 26 dependencies couldn't be built
error: build of '/nix/store/jl1a62krzychi3qcw5zj7ky61cf2gagm-git-2.19.0.drv' failed

@xeji
Copy link
Contributor

xeji commented Sep 17, 2018

let's see if at least "normal" git builds on darwin without a timeout
@GrahamcOfBorg build git

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: git

Partial log (click to expand)

Files=826, Tests=19367, 225 wallclock secs ( 5.56 usr  1.04 sys + 319.82 cusr 306.51 csys = 632.93 CPU)
Result: PASS
make clean-except-prove-cache
make[2]: Entering directory '/build/git-2.19.0/t'
rm -f -r 'chainlinttmp'
rm -f -r 'trash directory'.* 'test-results'
rm -f -r valgrind/bin
make[2]: Leaving directory '/build/git-2.19.0/t'
make[1]: Leaving directory '/build/git-2.19.0/t'
/nix/store/khy0660v0mpy5z6r5ykmz7vhi7a1almv-git-2.19.0

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-darwin (full log)

Attempted: git

Partial log (click to expand)

cannot build derivation '/nix/store/8dj28q5aldhafkxvwk6wcb50aw1j0d1l-configd-osx-10.8.5.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/r6wwgw33hzawvjc43s8qckaa6l6rlwdk-python-2.7.15.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/va22p9zi10ippyr1pa7x783c4yzbvk8i-asciidoc-8.6.9.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/vwzz1scjwvgxijg82mcz9p5zk0zsr1n7-libxml2-2.9.8.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/8qh11x7nzw21qyx2n13l9qgxd0vyq1mh-libxslt-1.1.32.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/3rw717r97djwxpd181vx7ghj9p5sxrla-xmlto-0.0.28.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/0d4qsqimh4na14kw86c54l428x1sg0gj-opensp-1.5.2.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/w1flq601vm8kgfij2724l6k44ki3gnd0-docbook2X-0.8.8.drv': 13 dependencies couldn't be built
cannot build derivation '/nix/store/v2wfa5dk6md3n7zv6zpragx2sn76ihf1-git-2.19.0.drv': 23 dependencies couldn't be built
error: build of '/nix/store/v2wfa5dk6md3n7zv6zpragx2sn76ihf1-git-2.19.0.drv' failed

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: git

Partial log (click to expand)

(cd po/build/locale && tar cf - .) | \
(cd '/nix/store/zsvbyalx2kzgb3i5bcsgcdz8r2nnwixp-git-2.19.0/share/locale' && umask 022 && tar xof -)
install -d -m 755 '/nix/store/zsvbyalx2kzgb3i5bcsgcdz8r2nnwixp-git-2.19.0/lib/perl5/site_perl/5.28.0'
(cd perl/build/lib && tar cf - .) | \
(cd '/nix/store/zsvbyalx2kzgb3i5bcsgcdz8r2nnwixp-git-2.19.0/lib/perl5/site_perl/5.28.0' && umask 022 && tar xof -)
tar: Skipping to next header
tar: Exiting with failure status due to previous errors
make: *** [Makefile:2758: install] Error 2
builder for '/nix/store/x859qljw46gb0ys64mamxvq5b0djp038-git-2.19.0.drv' failed with exit code 2
error: build of '/nix/store/x859qljw46gb0ys64mamxvq5b0djp038-git-2.19.0.drv' failed

@xeji
Copy link
Contributor

xeji commented Sep 17, 2018

Hm, I don't understand what's wrong with aarch64.

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: gitAndTools.gitFull

Partial log (click to expand)

(cd '/nix/store/dcmqrkd7rkm2wr37qknqfkrfl7i9d4d7-git-2.19.0/share/locale' && umask 022 && tar xof -)
install -d -m 755 '/nix/store/dcmqrkd7rkm2wr37qknqfkrfl7i9d4d7-git-2.19.0/lib/perl5/site_perl/5.28.0'
(cd perl/build/lib && tar cf - .) | \
(cd '/nix/store/dcmqrkd7rkm2wr37qknqfkrfl7i9d4d7-git-2.19.0/lib/perl5/site_perl/5.28.0' && umask 022 && tar xof -)
tar: Skipping to next header
tar: A lone zero block at 526
tar: Exiting with failure status due to previous errors
make: *** [Makefile:2758: install] Error 2
builder for '/nix/store/dw9kcg9dzgx9q89fawkwklmlgf6a9wna-git-2.19.0.drv' failed with exit code 2
error: build of '/nix/store/dw9kcg9dzgx9q89fawkwklmlgf6a9wna-git-2.19.0.drv' failed

@thefloweringash
Copy link
Member Author

I've done a few runs of nix-build . --check -A git on aarch64 and I haven't been able to reproduce that failure.

@xeji
Copy link
Contributor

xeji commented Sep 18, 2018

Good enough, thanks! Let's merge and observe on Hydra.

@xeji xeji merged commit 50454ec into NixOS:staging Sep 18, 2018
@thefloweringash
Copy link
Member Author

thefloweringash commented Sep 20, 2018 •
edited

git.aarch64-linux passed on hydra as build 81757777.
gitFull.aarch64-linux passed on hydra as build 81746040.

@thefloweringash thefloweringash deleted the git-2.19.0 branch September 20, 2018 12:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dtzWill dtzWill Awaiting requested review from dtzWill

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@thefloweringash @dtzWill @xeji @GrahamcOfBorg