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 #60169

Merged
merged 297 commits into from Apr 30, 2019
Merged

Staging next #60169

merged 297 commits into from Apr 30, 2019

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Apr 24, 2019

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 nix-review --run "nix-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.

volth added 2 commits April 25, 2019 14:14
(cherry picked from commit 1709d3a)
Fix for #59225 regression proposed by @matthewbauer
#59225 (comment)

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

@volth Cherry picked those. For future reference those usually these cross build things can go directly to master.

@FRidh
Copy link
Member Author

FRidh commented Apr 25, 2019

@matthewbauer the wasm change broke the tarball job due to a failing test https://hydra.nixos.org/build/92604062

@FRidh FRidh requested a review from edolstra as a code owner April 25, 2019 21:28
volth and others added 6 commits April 26, 2019 22:24
This undoes 6fb0e7a
The only problem with 6.04 is: it got new dependencies which fail to cross-compile.
Failure to cross-compile HTTP::Deamon leads to failure of LWP and XML::Parser, which are used in switch-to-configuration.pl
Thus upgrade HTTPDaemon from 6.01 to 6.04 broke cross-compilation of whole system closures.

(cherry picked from commit fd1ac66)
We want to make sure this value is explicitly set. Infering it for
every arch leads to annoying failures like:

https://hydra.nixos.org/build/92583832/

Perhaps we can enable it in the future with some smarter handling of
cc-wrapper.sh.
Was propagated by networkmanager before.
@FRidh FRidh merged commit fd2bd6e into master Apr 30, 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