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
Merge staging-next into master #44009
Conversation
treewide: either fix or disable tests
busybox: 1.29.0 -> 1.29.1
utillinux: 2.32 -> 2.32.1
bind: 9.12.1-P2 -> 9.12.2
treewide: simplify some dependency cycles
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.
mostly from void-linux (thanks!)
minor bump
npth: 1.5 -> 1.6
…uch-musl mesa: more include fixes
Also gets rid of the full python and some of it's dependencies in the stdenv build closure.
…ame" This reverts commit f8db20f. Patching should no longer be needed with 3.6.1.
[staging] substitute(): --subst-var was silently coercing to "" if the variable does not exist.
(cherry picked from commit f375825) Signed-off-by: Domen Kožar <domen@dev.si>
stdenv: cleanup darwin bootstrapping
libffi usages in stdenv broken darwin. We need to disable doCheck for that case.
"rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook
…lder, fixes #40273 When `py.test` was run with a folder as argument, it would not only search for tests in that folder, but also create a .pytest-cache folder. Not only is this state we don't want, but it was also causing collisions.
Currently all VM tests and the tarball job fail on master: https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents. That should be fixed on master first... |
With meson 0.47.0 (or 0.47.1, or git) things are very wrong re:rpath handling resulting in at best missing libs but even corrupt binaries :(. When we run patchelf it masks the problem by removing obviously busted paths. Which is probably why this wasn't noticed immediately. Unfortunately the binary already has a long series of paths scribbled in a space intended for a much smaller string; in my testing it was something like lengths were 67 with 300+ written to it. I think we've reported the relevant issues upstream, but unfortunately it appears our patches are what introduces the overwrite/corruption (by no longer being correct in what they assume) This doesn't look so bad to fix but it's not something I can spend more time on at the moment. -- Interestingly the overwritten string data (because it is scribbled past the bounds) remains in the binary and is why we're suddenly seeing unexpected references in various builds -- notably this is is the reason we're seeing the "extra-utils" breakage that entirely crippled NixOS on master (and probably on staging before?). Fixes #43650. This reverts commit 305ac4d. (cherry picked from commit 273d68e) Signed-off-by: Domen Kožar <domen@dev.si>
I'm going to merge this now, but the situation is not ideal. Here are the facts:
So I see two options: a) mass rebuilds on master (ofborg suffers) I think a) is arguably better, but NixOS/ofborg#66 should prevent these in the future. Eval of master after merge: https://hydra.nixos.org/eval/1470684 |
Motivation for this change
https://hydra.nixos.org/eval/1470461Waiting for new job due to large rebuilds on master.
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)