From fef586627ad9e8d38bd1d500b764dc172853ccc4 Mon Sep 17 00:00:00 2001 From: Sebastian Ullrich Date: Thu, 7 Nov 2019 10:45:59 +0100 Subject: [PATCH] chore: revert "chore: switch back to clang 8" This reverts commit bffc55219e1d8c9f3486f7b4c984ddd5bb4a40ac. --- azure-pipelines.yml | 2 +- default.nix | 2 +- shell.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7fbcd5c23b..ad7eb6d108 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -52,7 +52,7 @@ jobs: steps: - script: | choco install -y msys2 - C:\tools\msys64\usr\bin\bash -lc "pacman --noconfirm -S make python mingw-w64-x86_64-cmake git diffutils && pacman --noconfirm -U http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-llvm-8.0.1-3-any.pkg.tar.xz http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-clang-8.0.1-3-any.pkg.tar.xz" + C:\tools\msys64\usr\bin\bash -lc "pacman --noconfirm -S make python mingw-w64-x86_64-cmake mingw-w64-x86_64-clang git diffutils" displayName: Setup - script: | C:\tools\msys64\usr\bin\bash -l ./script/ci.sh diff --git a/default.nix b/default.nix index b97bbb56e3..849cac081e 100644 --- a/default.nix +++ b/default.nix @@ -1,3 +1,3 @@ -{ pkgs ? import ./nix/nixpkgs.nix, llvmPackages ? pkgs.llvmPackages_8 }: +{ pkgs ? import ./nix/nixpkgs.nix, llvmPackages ? pkgs.llvmPackages_9 }: pkgs.callPackage ./nix/derivation.nix { inherit llvmPackages; } diff --git a/shell.nix b/shell.nix index cbe092ceec..891920e5fd 100644 --- a/shell.nix +++ b/shell.nix @@ -1,4 +1,4 @@ -{ pkgs ? import ./nix/nixpkgs.nix, llvmPackages ? pkgs.llvmPackages_8 } @ args: +{ pkgs ? import ./nix/nixpkgs.nix, llvmPackages ?pkgs.llvmPackages_9 } @ args: let lean = import ./default.nix args;