Staging next #52983
Merged
Staging next #52983
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gcc doesn’t know all of the specific flags here. It is easier to just set -Wno-error.
libinput switched from Doxygen to Sphinx for user docs. Since Sphinx is a Python module, it propagates Python. And because it is listed in nativeBuildInputs, its python binary takes precedence over the one added in buildInputs. This results in a wrong interpreter being substituted into shebangs. The contamination occurred previously too but libinput does not use pyparsing dependency since 1.12.0, so it could be removed. I prevented Sphinx from propagating Python and added some additional dependencies to it. In the future we might want something more reusable. While at it, I also fixed the tests.
This fixes build errors like
GEN asn1ct_eval_ext.erl
{"init terminating in do_boot",{undef,[{asn1ct_func,start_link,[],[]},{prepare_templates,gen_asn1ct_eval,1,[{file,"prepare_templates.erl"},{line,58}]},{init,start_em,1,[]},{init,do_boot,3,[]}]}}
init terminating in do_boot ({undef,[{asn1ct_func,start_link,[],[]},{prepare_templates,gen_asn1ct_eval,1,[{_},{_}]},{init,start_em,1,[]},{init,do_boot,3,[]}]})
that occur on some machines but not others.
erlang: disable parallel building
llvm: fix cross-compilation
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/v4l-utils/versions
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wildmidi/versions
Ncurses uses `install -s` to also strip the binaries while installing. This broke the cross build because the wrong strip command was chosen.
libselinux needs native python to compute the installation prefix. Swig generates the c code for the extension and needs python.h at compile, so we put python into buildInputs
ncurses: fix cross-build by disable stripping
Otherwise -lpcap gets propagated to reverse deps This can break strongswan build for example #51252 (comment)
perl: update perl-cross archive
Glib uses gobject introspection to generate documentation. If we would want to cross-compile those, we would need native binaries from the previous build stage. Instead we can simply just copy over the generated documentation.
glib: fix cross -> inherit devdoc from native build
Only the make-based build support cross-compilation. Also use less vendored libraries
sysvinit: 2.89 -> 2.93
iptables: prune libtool files after build
GrahamcOfBorg
added
10.rebuild-darwin-stdenv
|
@matthewbauer What's the status of darwin, is it ready for master? |
|
I'm able to build lots of stuff locally but we were having issues on the Hydra machines. This is the error that happened on the last eval: https://hydra.nixos.org/build/86006395 It most likely has to do with differences between macOS 10.12 and 10.14. If someone could reproduce that error & include the config.log that would be really helpful. |
|
Several linking errors (DSO) #53001 |
GrahamcOfBorg
added
the
2.status: merge conflict
GrahamcOfBorg
removed
the
2.status: merge conflict
|
In that case I propose we revert it here for now and branch off from there. Both copumpkin and I have a testing jobset for darwin so we can reuse that and with the increased capacity we don't have to worry too much about holding up other builds. There are currently 2 darwin jobs in the queue 😄 . |
|
@LnL7 @matthewbauer if you want to revert, then please do so before the weekend because I would like to merge this into master. |
fixes some issues in my commits in: - basic_cmds - network_cmds (cherry picked from commit f283145)
Not all installs will have a $drivers output, so we just create an empty one here.
A few more rebuilds (~1k on x86_64-linux).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)