diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2022-03-29 16:31:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-29 16:31:31 +0200 |
commit | f357391e75eb78ebcff6277b10141b415752bded (patch) | |
tree | 4f04b8e8820c3c4fad487de70f520d25eb53e4c9 /pkgs/top-level/all-packages.nix | |
parent | e9c2918e9bce73019f9581b26555bbd5bcb44e78 (diff) | |
parent | a8aaeb6e5379f8b6455fa1072822de0c8099bbbe (diff) | |
download | nixlib-f357391e75eb78ebcff6277b10141b415752bded.tar nixlib-f357391e75eb78ebcff6277b10141b415752bded.tar.gz nixlib-f357391e75eb78ebcff6277b10141b415752bded.tar.bz2 nixlib-f357391e75eb78ebcff6277b10141b415752bded.tar.lz nixlib-f357391e75eb78ebcff6277b10141b415752bded.tar.xz nixlib-f357391e75eb78ebcff6277b10141b415752bded.tar.zst nixlib-f357391e75eb78ebcff6277b10141b415752bded.zip |
Merge pull request #164732 from thevar1able/clickhouse
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97720b99172c..25254e333f02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21284,9 +21284,10 @@ with pkgs; clamsmtp = callPackage ../servers/mail/clamsmtp { }; clickhouse = callPackage ../servers/clickhouse { - # upstream requires llvm10 as of v20.11.4.13 - inherit (llvmPackages_10) clang-unwrapped lld llvm; - llvm-bintools = llvmPackages_10.bintools; + # upstream requires llvm12 as of v22.3.2.2 + inherit (llvmPackages_12) clang-unwrapped lld llvm; + llvm-bintools = llvmPackages_12.bintools; + stdenv = llvmPackages_12.stdenv; }; clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli; |