diff options
author | Michael Roitzsch <reactorcontrol@icloud.com> | 2019-10-21 11:02:16 +0200 |
---|---|---|
committer | Michael Roitzsch <reactorcontrol@icloud.com> | 2020-01-15 13:23:49 +0100 |
commit | b472f4a2de06d1ef8d4feeec30a72cce82bbc7e6 (patch) | |
tree | b19b66b209bc86dbed58b63acfcf001415af5020 /pkgs/development/compilers/swift | |
parent | 29098a81b3720590cde0b0b92bfbf3e66fd9d31b (diff) |
swift: 5.0.2 -> 5.1.1
Diffstat (limited to 'pkgs/development/compilers/swift')
8 files changed, 53 insertions, 44 deletions
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index a3aa5f89c1c58..5a61e775a9cab 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -33,7 +33,7 @@ }: let - version = "5.0.2"; + version = "5.1.1"; fetch = { repo, sha256, fetchSubmodules ? false }: fetchFromGitHub { @@ -44,19 +44,29 @@ let }; sources = { - # FYI: SourceKit probably would work but currently requires building everything twice - # For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759 llvm = fetch { repo = "swift-llvm"; - sha256 = "1bnscqsiljiclij60f44h2fyx5c84pzry0lz1jbwknphwmqd6f84"; + sha256 = "00ldd9dby6fl6nk3z17148fvb7g9x4jkn1afx26y51v8rwgm1i7f"; }; compilerrt = fetch { repo = "swift-compiler-rt"; - sha256 = "0bba54xa7z0wj6k7a24q74gc4yajc6s64g1m894i3yd6swdk7f6r"; + sha256 = "1431f74l0n2dxn728qp65nc6hivx88fax1wzfrnrv19y77br05wj"; }; clang = fetch { repo = "swift-clang"; - sha256 = "046p7f4044ls8hhgklsz32md5jvxkaaim1d75n0fmnwap6di3n1q"; + sha256 = "0n7k6nvzgqp6h6bfqcmna484w90db3zv4sh5rdh89wxyhdz6rk4v"; + }; + clangtools = fetch { + repo = "swift-clang-tools-extra"; + sha256 = "0snp2rpd60z239pr7fxpkj332rkdjhg63adqvqdkjsbrxcqqcgqa"; + }; + indexstore = fetch { + repo = "indexstore-db"; + sha256 = "1gwkqkdmpd5hn7555dpdkys0z50yh00hjry2886h6rx7avh5p05n"; + }; + sourcekit = fetch { + repo = "sourcekit-lsp"; + sha256 = "0k84ssr1k7grbvpk81rr21ii8csnixn9dp0cga98h6i1gshn8ml4"; }; cmark = fetch { repo = "swift-cmark"; @@ -64,32 +74,32 @@ let }; lldb = fetch { repo = "swift-lldb"; - sha256 = "01yrhc1ggv89qii03fdjdvb2aq9v4hd1wk83n8ygrwwc75p44qmi"; + sha256 = "0j787475f0nlmvxqblkhn3yrvn9qhcb2jcijwijxwq95ar2jdygs"; }; llbuild = fetch { repo = "swift-llbuild"; - sha256 = "0ipwryzpqxpk3rzkxilfahlkz06k39j91q2lv7fprf0slqknrdms"; + sha256 = "1n2s5isxyl6b6ya617gdzjbw68shbvd52vsfqc1256rk4g448v8b"; }; pm = fetch { repo = "swift-package-manager"; - sha256 = "1mnywlm7i2mbp16q0rskskvnbx1ap8lchwr8q3gx0xs3b2fs6chh"; + sha256 = "1a49jmag5mpld9zr96g8a773334mrz1c4nyw38gf4p6sckf4jp29"; }; xctest = fetch { repo = "swift-corelibs-xctest"; - sha256 = "1vpljkxhfk3yd07ry0xsv3qwbn62pwd2mdn9cw22jhbhvqinc13z"; + sha256 = "0rxy9sq7i0s0kxfkz0hvdp8zyb40h31f7g4m0kry36qk82gzzh89"; }; foundation = fetch { repo = "swift-corelibs-foundation"; - sha256 = "1wys4xh7f6c7yjf210x41n2krmyi2qj1wpxbv0p48d230va1azj1"; + sha256 = "1iiiijsnys0r3hjcj1jlkn3yszzi7hwb2041cnm5z306nl9sybzp"; }; libdispatch = fetch { repo = "swift-corelibs-libdispatch"; - sha256 = "0chnb0d4xjyn9wnc8bgimd5ji5igfyq891flgnqpfwr4y26496c1"; + sha256 = "0laqsizsikyjhrzn0rghvxd8afg4yav7cbghvnf7ywk9wc6kpkmn"; fetchSubmodules = true; }; swift = fetch { repo = "swift"; - sha256 = "0fsq1y8dz4ssn90akvzj36cqyblalb09bjzy4ikqn67mb5x99wpb"; + sha256 = "0m4r1gzrnn0s1c7haqq9dlmvpqxbgbkbdfmq6qaph869wcmvdkvy"; }; }; @@ -155,6 +165,9 @@ stdenv.mkDerivation { cp -r ${sources.llvm} llvm cp -r ${sources.compilerrt} compiler-rt cp -r ${sources.clang} clang + cp -r ${sources.clangtools} clang-tools-extra + cp -r ${sources.indexstore} indexstore-db + cp -r ${sources.sourcekit} sourcekit-lsp cp -r ${sources.cmark} cmark cp -r ${sources.lldb} lldb cp -r ${sources.llbuild} llbuild @@ -199,9 +212,8 @@ stdenv.mkDerivation { \ -e 's/^swift-install-components=autolink.*$/\0;editor-integration/' - # https://bugs.swift.org/browse/SR-10559 - patch -p1 -d swift-corelibs-libdispatch -i ${./patches/libdispatch-fortify-fix.patch} - + substituteInPlace clang/lib/Driver/ToolChains/Linux.cpp \ + --replace 'SysRoot + "/lib' '"${glibc}/lib" "' substituteInPlace clang/lib/Driver/ToolChains/Linux.cpp \ --replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "' patch -p1 -d clang -i ${./patches/llvm-toolchain-dir.patch} @@ -211,6 +223,10 @@ stdenv.mkDerivation { sed -i 's/curses/ncurses/' llbuild/*/*/CMakeLists.txt PREFIX=''${out/#\/} + substituteInPlace indexstore-db/Utilities/build-script-helper.py \ + --replace usr "$PREFIX" + substituteInPlace sourcekit-lsp/Utilities/build-script-helper.py \ + --replace usr "$PREFIX" substituteInPlace swift-corelibs-xctest/build_script.py \ --replace usr "$PREFIX" ''; @@ -222,9 +238,6 @@ stdenv.mkDerivation { export SWIFT_BUILD_ROOT=$PWD/build export SWIFT_INSTALL_DIR=$PWD/install - unset CC - unset CXX - export INSTALLABLE_PACKAGE=$PWD/swift.tar.gz export NIX_ENFORCE_PURITY= @@ -237,6 +250,12 @@ stdenv.mkDerivation { # During the Swift build, a full local LLVM build is performed and the resulting clang is invoked. # This compiler is not using the Nix wrappers, so it needs some help to find things. export NIX_LDFLAGS_BEFORE="-rpath ${clang.cc.gcc.lib}/lib -L${clang.cc.gcc.lib}/lib $NIX_LDFLAGS_BEFORE" + # However, we want to use the wrapped compiler whenever possible. + export CC="${clang}/bin/clang" + + # fix for https://bugs.llvm.org/show_bug.cgi?id=39743 + # see also https://forums.swift.org/t/18138/15 + export CCC_OVERRIDE_OPTIONS="#x-fmodules s/-fmodules-cache-path.*//" $SWIFT_SOURCE_ROOT/swift/utils/build-script \ --preset=buildbot_linux \ @@ -265,6 +284,11 @@ stdenv.mkDerivation { tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 ''${out/#\/} find $out -type d -empty -delete + # fix installation weirdness, also present in Appleās official tarballs + mv $out/local/include/indexstore $out/include + rmdir $out/local/include $out/local + rm -r $out/bin/sdk-module-lists $out/bin/swift-api-checker.py + wrapProgram $out/bin/swift \ --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \ diff --git a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch index 70b7b0ff73be2..60b2996b3405d 100644 --- a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch +++ b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch @@ -2,7 +2,7 @@ Don't build Ninja, we use our own. --- a/utils/build-presets.ini +++ b/utils/build-presets.ini -@@ -721,7 +721,7 @@ swiftpm +@@ -745,7 +745,7 @@ swiftpm dash-dash diff --git a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch index 9122cf01cc8fb..5ca6bf1354dce 100644 --- a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch +++ b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch @@ -2,12 +2,12 @@ allow custom install prefix --- a/utils/build-presets.ini 2019-04-11 14:51:40.060259462 +0200 +++ b/utils/build-presets.ini 2019-04-11 15:16:17.471137969 +0200 -@@ -728,7 +728,7 @@ +@@ -752,7 +752,7 @@ install-swiftpm install-xctest install-libicu -install-prefix=/usr +install-prefix=%(install_prefix)s - swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc - llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt install-libcxx + install-sourcekit-lsp + build-swift-static-stdlib diff --git a/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch b/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch index d749a430a32dd..0a66af9e5137b 100644 --- a/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch +++ b/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch @@ -2,7 +2,7 @@ Disable targets, where we use Nix packages. --- a/utils/build-presets.ini 2019-04-11 15:19:57.845178834 +0200 +++ b/utils/build-presets.ini 2019-04-11 15:27:42.041297057 +0200 -@@ -716,8 +716,6 @@ +@@ -740,8 +740,6 @@ llbuild swiftpm xctest @@ -11,15 +11,13 @@ Disable targets, where we use Nix packages. dash-dash -@@ -727,11 +725,9 @@ +@@ -751,9 +749,7 @@ install-llbuild install-swiftpm install-xctest -install-libicu install-prefix=%(install_prefix)s - swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc - llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt -install-libcxx + install-sourcekit-lsp build-swift-static-stdlib build-swift-static-sdk-overlay - build-swift-stdlib-unittest-extra diff --git a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch index 9710f6a108371..304b53a1dbf17 100644 --- a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch +++ b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch @@ -2,7 +2,7 @@ plumb extra-cmake-options --- a/utils/build-presets.ini +++ b/utils/build-presets.ini -@@ -743,6 +743,8 @@ install-destdir=%(install_destdir)s +@@ -766,6 +766,8 @@ install-destdir=%(install_destdir)s # Path to the .tar.gz package we would create. installable-package=%(installable_package)s diff --git a/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch b/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch index df906f9c84c7e..c05db5208012d 100644 --- a/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch +++ b/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch @@ -2,7 +2,7 @@ The Nix glibc headers do not use include/x86_64-linux-gnu subdirectories. --- swift/stdlib/public/Platform/CMakeLists.txt 2019-04-09 20:14:44.493801403 +0200 +++ swift/stdlib/public/Platform/CMakeLists.txt 2019-04-09 20:14:44.577800593 +0200 -@@ -68,7 +68,7 @@ +@@ -77,7 +77,7 @@ endif() set(GLIBC_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}") diff --git a/pkgs/development/compilers/swift/patches/libdispatch-fortify-fix.patch b/pkgs/development/compilers/swift/patches/libdispatch-fortify-fix.patch deleted file mode 100644 index d23a308d68f4f..0000000000000 --- a/pkgs/development/compilers/swift/patches/libdispatch-fortify-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Nix compiles with _FORTIFY_SOURCE enabled. Fix error due to -Werror and an unused return value warning. - ---- swift-corelibs-libdispatch/src/internal.h 2019-04-26 09:33:38.287289099 +0200 -+++ swift-corelibs-libdispatch/src/internal.h 2019-04-26 15:31:10.485334128 +0200 -@@ -1053,7 +1053,7 @@ - #else - #define _dispatch_client_assert_fail(fmt, ...) do { \ - char *_msg = NULL; \ -- asprintf(&_msg, "%s" fmt, DISPATCH_ASSERTION_FAILED_MESSAGE, \ -+ (void)asprintf(&_msg, "%s" fmt, DISPATCH_ASSERTION_FAILED_MESSAGE, \ - ##__VA_ARGS__); \ - _dispatch_assert_crash(_msg); \ - free(_msg); \ diff --git a/pkgs/development/compilers/swift/purity.patch b/pkgs/development/compilers/swift/purity.patch index a358c2acb6617..4133e89c28306 100644 --- a/pkgs/development/compilers/swift/purity.patch +++ b/pkgs/development/compilers/swift/purity.patch @@ -2,7 +2,7 @@ --- a/lib/Driver/ToolChains/Gnu.cpp +++ b/lib/Driver/ToolChains/Gnu.cpp -@@ -380,13 +380,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, +@@ -402,13 +402,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, if (!Args.hasArg(options::OPT_static)) { if (Args.hasArg(options::OPT_rdynamic)) CmdArgs.push_back("-export-dynamic"); |