Skip to content

swift: 5.7.3 -> 5.8#225197

Merged
domenkozar merged 3 commits intoNixOS:masterfrom
stephank:feat/swift58
May 5, 2023
Merged

swift: 5.7.3 -> 5.8#225197
domenkozar merged 3 commits intoNixOS:masterfrom
stephank:feat/swift58

Conversation

@stephank
Copy link
Contributor

@stephank stephank commented Apr 7, 2023

Description of changes

This also fixes the Linux build.

Result of nixpkgs-review run on aarch64-darwin 1

6 packages failed to build:
  • clipboard-jh
  • hydrus
  • hydrus.doc
  • kakoune-cr
  • mpc-qt
  • scry
69 packages built:
  • ameba
  • amqpcat
  • ani-cli
  • anki
  • anki.dist
  • anki.doc
  • anki.man
  • clang-tools_15
  • clang_15
  • cplay-ng
  • cplay-ng.dist
  • crystal (crystal_1_8)
  • crystal.bin (crystal_1_8.bin)
  • crystal.lib (crystal_1_8.lib)
  • crystal2nix
  • curseradio
  • curseradio.dist
  • dmlive
  • ff2mpv
  • icr
  • invidious
  • llvmPackages_15.clangNoLibc
  • llvmPackages_15.clangNoLibcxx
  • llvmPackages_15.clangUseLLVM
  • llvmPackages_15.compiler-rt (llvmPackages_15.compiler-rt-libc)
  • llvmPackages_15.compiler-rt.dev (llvmPackages_15.compiler-rt-libc.dev)
  • llvmPackages_15.libcxx
  • llvmPackages_15.libcxx.dev
  • llvmPackages_15.stdenv (llvmPackages_15.libcxxStdenv)
  • llvmPackages_15.libstdcxxClang
  • llvmPackages_15.libunwind
  • llvmPackages_15.libunwind.dev
  • lucky-cli
  • mnemosyne
  • mnemosyne.dist
  • mpv
  • mpv-unwrapped
  • mpv-unwrapped.dev
  • mpv-unwrapped.man
  • oq
  • plex-media-player
  • python310Packages.mpv
  • python310Packages.mpv.dist
  • python311Packages.mpv
  • python311Packages.mpv.dist
  • shards (shards_0_17)
  • somafm-cli
  • sourcekit-lsp
  • subtitleedit
  • swift
  • swift.man
  • swiftPackages.XCTest
  • swiftPackages.clang
  • swiftPackages.stdenv
  • swiftPackages.swift-docc
  • swiftPackages.swift-driver
  • swiftPackages.swift-unwrapped
  • swiftPackages.swift-unwrapped.dev
  • swiftPackages.swift-unwrapped.doc
  • swiftPackages.swift-unwrapped.lib
  • swiftPackages.swift-unwrapped.man
  • swiftPackages.swiftNoSwiftDriver
  • swiftPackages.swiftNoSwiftDriver.man
  • swiftPackages.swiftpm
  • swiftPackages.xcbuild
  • swiftpm2nix
  • thicket
  • wtwitch
  • ytfzf

The rebuild on Darwin is a little larger primarily because of the compiler-rt fix, but it should be benign.

On x86_64-darwin, I didn't run a full build of all dependents, but swift, sourcekit-lsp and mpv build successfully. (The compiler-rt change only affects ARM.)

Similarly on x86_64-linux, I only built swift and sourcekit-lsp. (The compiler-rt change doesn't affect Linux.)

Regarding the failures above:

  • clipboard-jh: No previous Hydra build for Darwin. (Broken?) Failure seems unrelated.
  • hydrus: Strange intermittent dyld assertion failure in install tests. A rebuild did succeed.
  • kakoune-cr: Also broken on master for Darwin.
  • mpc-qt: No previous Hydra build for Darwin. (Broken?) Failure seems unrelated.
  • scry: Also broken on master for Darwin.

So it looks like there are no new failures.

Fixes #229280

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested review from Trundle, dduan, dtzWill and trepetti April 7, 2023 19:20
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Apr 7, 2023
@stephank stephank force-pushed the feat/swift58 branch 3 times, most recently from 0882cc7 to 0897f27 Compare April 17, 2023 20:31
@stephank stephank force-pushed the feat/swift58 branch 3 times, most recently from b1fe5cd to eea3fae Compare April 20, 2023 20:09
@stephank stephank force-pushed the feat/swift58 branch 3 times, most recently from 4610421 to 1acf855 Compare April 22, 2023 12:43
@stephank stephank marked this pull request as ready for review April 22, 2023 20:57
Copy link
Member

@RaitoBezarius RaitoBezarius left a comment

Choose a reason for hiding this comment

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

On LLVM changes: sounds good, please apply it to LLVM git too. :)

@RaitoBezarius
Copy link
Member

@ofborg build llvmPackages_15.compiler-rt

Darwin-specific builtins were present on x86-64-darwin, but not on
aarch64-darwin. This is the same issue as NixOS#186575, but while the fixes
were correctly applied to LLVM 15, we were still disabling the build of
builtins on aarch64-darwin. Likely just a confusion.
@stephank
Copy link
Contributor Author

I was also able to fix the Linux build, and opened upstream PRs.

@stephank stephank mentioned this pull request May 1, 2023
@GaetanLepage
Copy link
Contributor

Well done !
This fixes the build of swiftpm and thus sourcekit-lsp which are both broken on master.

@GaetanLepage GaetanLepage requested a review from RaitoBezarius May 3, 2023 21:40
Copy link
Member

@RaitoBezarius RaitoBezarius left a comment

Choose a reason for hiding this comment

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

Nothing changed on the LLVM side. We just merged LLVM16 FWIW.

@domenkozar domenkozar merged commit 6cf7bb9 into NixOS:master May 5, 2023
@stephank stephank deleted the feat/swift58 branch May 5, 2023 13:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Build failure: swift

5 participants