Navigation Menu

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

Jump to bottom

systems/doubles.nix: add Apple doubles #64450

Merged
merged 1 commit into from Jul 9, 2019
Merged

systems/doubles.nix: add Apple doubles #64450

merged 1 commit into from Jul 9, 2019

Conversation

matthewbauer
Copy link
Member

These are used in cross-compilation to iOS devices and simulators.

Fallout from #60349.

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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@matthewbauer
systems/doubles.nix: add Apple doubles
00ba557 
These are used in cross-compilation to iOS devices and simulators.

Fallout from NixOS#60349.
@Ericson2314 Ericson2314 merged commit 7a02e47 into NixOS:master Jul 9, 2019
@samueldr
Copy link
Member

This doesn't pass the regression tests for the tarball job.

regression tests for lib failed, got: [ { expected = [ "aarch64-darwin" "aarch64-linux" "aarch64-none" "arm-none" "armv5tel-linux" "armv6l-linux" "armv7a-darwin" "armv7l-linux" "avr-none" "i686-cygwin" "i686-darwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-none" "i686-openbsd" "i686-windows" "mipsel-linux" "msp430-none" "powerpc-none" "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "wasm32-wasi" "wasm64-wasi" "x86_64-cygwin" "x86_64-darwin" "x86_64-darwin" "x86_64-freebsd" "x86_64-linux" "x86_64-netbsd" "x86_64-none" "x86_64-openbsd" "x86_64-solaris" "x86_64-windows" ]; name = "testall"; result = [ "aarch64-ios" "aarch64-linux" "aarch64-none" "arm-none" "armv5tel-linux" "armv6l-linux" "armv7a-ios" "armv7l-linux" "avr-none" "i686-cygwin" "i686-freebsd" "i686-ios" "i686-linux" "i686-netbsd" "i686-none" "i686-openbsd" "i686-windows" "mipsel-linux" "msp430-none" "powerpc-none" "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "wasm32-wasi" "wasm64-wasi" "x86_64-cygwin" "x86_64-darwin" "x86_64-freebsd" "x86_64-ios" "x86_64-linux" "x86_64-netbsd" "x86_64-none" "x86_64-openbsd" "x86_64-solaris" "x86_64-windows" ]; } { expected = [ "arm-none" "armv5tel-linux" "armv6l-linux" "armv7l-linux" ]; name = "testarm"; result = [ "arm-none" "armv5tel-linux" "armv6l-linux" "armv7a-darwin" "armv7l-linux" ]; } { expected = [ "x86_64-darwin" ]; name = "testdarwin"; result = [ "aarch64-darwin" "armv7a-darwin" "i686-darwin" "x86_64-darwin" "x86_64-darwin" ]; } { expected = [ "i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-none" "i686-openbsd" "i686-windows" ]; name = "testi686"; result = [ "i686-cygwin" "i686-darwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-none" "i686-openbsd" "i686-windows" ]; } { expected = [ "x86_64-cygwin" "x86_64-darwin" "x86_64-freebsd" "x86_64-linux" "x86_64-netbsd" "x86_64-none" "x86_64-openbsd" "x86_64-solaris" "x86_64-windows" ]; name = "testx86_64"; result = [ "x86_64-cygwin" "x86_64-darwin" "x86_64-darwin" "x86_64-freebsd" "x86_64-linux" "x86_64-netbsd" "x86_64-none" "x86_64-openbsd" "x86_64-solaris" "x86_64-windows" ]; } ]

Tests in lib/tests/systems.nix. Couldn't exactly figure out how to fix it, sorry.

@FRidh
Copy link
Member

FRidh commented Jul 10, 2019

I attempted to fix it, but it's not clear to me when we want it to have ios and when darwin. Reverted in ce2f74d.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ericson2314 Ericson2314 Ericson2314 approved these changes

@nbp nbp Awaiting requested review from nbp

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

Successfully merging this pull request may close these issues.

None yet
5 participants
@matthewbauer @samueldr @FRidh @Ericson2314 @vcunat