diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-06 06:17:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-06 06:17:06 +0000 |
| commit | 8a52c4c658c6543c481b00346ccdb3b358e5c4d1 (patch) | |
| tree | 440b28289cd1ec35cc360807edb465fe3b78c1d3 /pkgs/top-level/all-packages.nix | |
| parent | 6ce08f74dc7518d35aa52f9b83fa84ae716854b8 (diff) | |
| parent | bb2a7b943917aba1c9c86f049e75a4a594040746 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8474b82c945a..500c3b8dd1ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16887,8 +16887,8 @@ in clamsmtp = callPackage ../servers/mail/clamsmtp { }; clickhouse = callPackage ../servers/clickhouse { - # clickhouse doesn't build on llvm8. - inherit (llvmPackages_9) clang-unwrapped lld lldClang llvm; + # upstream requires llvm10 as of v20.11.4.13 + inherit (llvmPackages_10) clang-unwrapped lld lldClang llvm; }; couchdb = callPackage ../servers/http/couchdb { |