From 5c6e054e24abf475d1bd89e9102237a0a9ccaad7 Mon Sep 17 00:00:00 2001 From: Sebastian Ullrich Date: Wed, 23 Mar 2022 17:31:41 +0100 Subject: [PATCH] chore: update to LLVM 14 --- .github/workflows/ci.yml | 6 +++--- nix/packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce47cf44ba..eb56057e34 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: os: ubuntu-latest release: true shell: nix-shell --arg pkgsDist "import (fetchTarball \"channel:nixos-19.03\") {{}}" --run "bash -euxo pipefail {0}" - llvm-url: https://github.com/leanprover/lean-llvm/releases/download/13.0.0/lean-llvm-x86_64-linux-gnu.tar.zst + llvm-url: https://github.com/leanprover/lean-llvm/releases/download/14.0.0/lean-llvm-x86_64-linux-gnu.tar.zst prepare-llvm: script/prepare-llvm-linux.sh lean-llvm* binary-check: ldd -v - name: Linux @@ -70,7 +70,7 @@ jobs: release: true shell: bash -euxo pipefail {0} CMAKE_OPTIONS: -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 - llvm-url: https://github.com/leanprover/lean-llvm/releases/download/13.0.0/lean-llvm-x86_64-apple-darwin.tar.zst + llvm-url: https://github.com/leanprover/lean-llvm/releases/download/14.0.0/lean-llvm-x86_64-apple-darwin.tar.zst prepare-llvm: script/prepare-llvm-macos.sh lean-llvm* binary-check: otool -L - name: Windows @@ -80,7 +80,7 @@ jobs: CMAKE_OPTIONS: -G "Unix Makefiles" # for reasons unknown, interactivetests are flaky on Windows CTEST_OPTIONS: --repeat until-pass:2 - llvm-url: https://github.com/leanprover/lean-llvm/releases/download/13.0.0/lean-llvm-x86_64-w64-windows-gnu.tar.zst + llvm-url: https://github.com/leanprover/lean-llvm/releases/download/14.0.0/lean-llvm-x86_64-w64-windows-gnu.tar.zst prepare-llvm: script/prepare-llvm-mingw.sh lean-llvm* binary-check: ldd # complete all jobs diff --git a/nix/packages.nix b/nix/packages.nix index 5c136ecf19..00cd3a31e2 100644 --- a/nix/packages.nix +++ b/nix/packages.nix @@ -5,7 +5,7 @@ let ${nix.defaultPackage.${system}}/bin/nix --experimental-features 'nix-command flakes' --extra-substituters https://lean4.cachix.org/ --option warn-dirty false "$@" ''; # https://github.com/NixOS/nixpkgs/issues/130963 - llvmPackages = if stdenv.isDarwin then llvmPackages_11 else llvmPackages_13; + llvmPackages = if stdenv.isDarwin then llvmPackages_11 else llvmPackages_14; cc = (ccacheWrapper.override rec { cc = llvmPackages.clang; extraConfig = ''