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.

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 next #52983

Merged
merged 248 commits into from Jan 6, 2019
Merged

Staging next #52983

merged 248 commits into from Jan 6, 2019

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Dec 27, 2018

Motivation for this change
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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Mic92 and others added 30 commits November 25, 2018 00:45
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.
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
iptables: prune libtool files after build
@LnL7
Copy link
Member

LnL7 commented Dec 27, 2018

@matthewbauer What's the status of darwin, is it ready for master?

@matthewbauer
Copy link
Member

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.

@FRidh
Copy link
Member Author

FRidh commented Dec 28, 2018

Several linking errors (DSO) #53001

(cherry picked from commit 0b468bf)
These just copy commands from Products/Release/. But with #52256 we
now build .dsym directories that somehow wind up in Products/Release/.
This makes things more exact by just copying the files in Products/Release/.
@matthewbauer
Copy link
Member

@LnL7 @FRidh It looks like there are a lot more failures with the new Darwin stdenv stuff than I expected. I have opened a PR to fix some of them here:

#53230

But, I wonder if it would be best to take these out of staging-next? I should probably create a Hydra jobset to handle all of them.

@LnL7
Copy link
Member

LnL7 commented Jan 2, 2019

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

@FRidh
Copy link
Member Author

FRidh commented Jan 3, 2019

@LnL7 @matthewbauer if you want to revert, then please do so before the weekend because I would like to merge this into master.

Reverts commits bumping to macOS stuff to 10.12:

commit ec1f78d.
commit d0dc91d.
commit a1d2973.
commit 4251121.
commit e6f7f29.
fixes some issues in my commits in:

- basic_cmds
- network_cmds

(cherry picked from commit f283145)
@matthewbauer
Copy link
Member

matthewbauer commented Jan 3, 2019

Ok reverted in 8505e71 (and then unreverted in #53230). Will follow the eval today in case anything is still broken.

@FRidh
Copy link
Member Author

FRidh commented Jan 4, 2019

matthewbauer and others added 5 commits January 4, 2019 10:28
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).
@FRidh FRidh merged commit be1c03d into master Jan 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet