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.

Sign up for GitHub

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

swift: 4.0.3 -> 4.1 #38172

Merged
merged 2 commits into from Mar 31, 2018
Merged

swift: 4.0.3 -> 4.1 #38172

merged 2 commits into from Mar 31, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Mar 31, 2018

Patching up build system and such was a pain
(error always occurs right at the end of long builds! always! :D)
but other than minor touchups was a straightforward upgrade.

Resulting "swift" can handle "import Foundation",
and I'm able to build a local non-trivial project.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 a few binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: swift

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: swift

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: swift

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

dtzWill
dtzWill commented Mar 31, 2018
View reviewed changes
pkgs/development/compilers/swift/default.nix
};
compilerrt = fetch {
repo = "swift-compiler-rt";
sha256 = "1hj4qaj4c9n2wzg2cvarbyl0n708zd1dlw4zkzq07fjxxqs36nfa";
sha256 = "1wkymmxi2v759xkwlzfrq9rivndjfvp6ikrzz10mvvrvyvrgwqnl";
};
cmark = fetch {
repo = "swift-cmark";
sha256 = "1nmxp0fj749sgar682c5nsj7zxxigqwg973baxj2r656a7ybh325";
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked this multiple times, but it still bugs me that the hash for this didn't change! haha

@dtzWill dtzWill merged commit 136a6d9 into NixOS:master Mar 31, 2018
@dtzWill dtzWill deleted the update/swift-4.1 branch March 31, 2018 06:10
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: swift

Partial log (click to expand)

shrinking /nix/store/qrv2996c20kwacxrahphqcidz60draqi-swift-4.1/lib/lldb/clang/lib/linux/libclang_rt.ubsan_standalone-x86_64.so
shrinking /nix/store/qrv2996c20kwacxrahphqcidz60draqi-swift-4.1/lib/lldb/clang/lib/linux/libclang_rt.dyndd-x86_64.so
shrinking /nix/store/qrv2996c20kwacxrahphqcidz60draqi-swift-4.1/lib/lldb/clang/lib/linux/libclang_rt.asan-x86_64.so
gzipping man pages under /nix/store/qrv2996c20kwacxrahphqcidz60draqi-swift-4.1/share/man/
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/qrv2996c20kwacxrahphqcidz60draqi-swift-4.1/lib  /nix/store/qrv2996c20kwacxrahphqcidz60draqi-swift-4.1/libexec  /nix/store/qrv2996c20kwacxrahphqcidz60draqi-swift-4.1/bin
patching script interpreter paths in /nix/store/qrv2996c20kwacxrahphqcidz60draqi-swift-4.1
checking for references to /tmp/nix-build-swift-4.1.drv-0 in /nix/store/qrv2996c20kwacxrahphqcidz60draqi-swift-4.1...
wrong ELF type
/nix/store/qrv2996c20kwacxrahphqcidz60draqi-swift-4.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: swift

Partial log (click to expand)

shrinking /nix/store/qrv2996c20kwacxrahphqcidz60draqi-swift-4.1/bin/swift-package
shrinking /nix/store/qrv2996c20kwacxrahphqcidz60draqi-swift-4.1/bin/swift-build
shrinking /nix/store/qrv2996c20kwacxrahphqcidz60draqi-swift-4.1/bin/.swift-wrapped
gzipping man pages under /nix/store/qrv2996c20kwacxrahphqcidz60draqi-swift-4.1/share/man/
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/qrv2996c20kwacxrahphqcidz60draqi-swift-4.1/lib  /nix/store/qrv2996c20kwacxrahphqcidz60draqi-swift-4.1/libexec  /nix/store/qrv2996c20kwacxrahphqcidz60draqi-swift-4.1/bin
patching script interpreter paths in /nix/store/qrv2996c20kwacxrahphqcidz60draqi-swift-4.1
checking for references to /build in /nix/store/qrv2996c20kwacxrahphqcidz60draqi-swift-4.1...
wrong ELF type
/nix/store/qrv2996c20kwacxrahphqcidz60draqi-swift-4.1

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: swift

Partial log (click to expand)

[93/107] Building CXX object unittests/BuildSystem/CMakeFiles/BuildSystemTests.dir/BuildSystemTaskTests.cpp.o
[94/107] Building CXX object lib/Core/CMakeFiles/llbuildCore.dir/BuildEngine.cpp.o
[95/107] Linking CXX static library lib/libllbuildCore.a
[96/107] Building CXX object lib/BuildSystem/CMakeFiles/llbuildBuildSystem.dir/BuildSystem.cpp.o
[97/107] Linking CXX static library lib/libllbuildBuildSystem.a
[98/107] Linking CXX shared library lib/libllbuild.so
[99/107] Linking CXX executable bin/swift-build-tool
[100/107] Linking CXX executable bin/llbuild
building of '/nix/store/20nab9pv6didfgc8bhpw1k4w4kc50mg2-swift-4.1.drv' timed out after 3600 seconds
�[31;1merror:�[0m build of '/nix/store/20nab9pv6didfgc8bhpw1k4w4kc50mg2-swift-4.1.drv' failed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@dtzWill @GrahamcOfBorg