Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

clickhouse: 20.5.2.7 -> 20.11.4.13 #105968

Merged
merged 1 commit into from Dec 6, 2020
Merged

Conversation

RaghavSood
Copy link
Member

Motivation for this change

Follow up on #105224

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@@ -46,7 +55,6 @@ stdenv.mkDerivation rec {

cmakeFlags = [
"-DENABLE_TESTS=OFF"
"-DUSE_INTERNAL_LLVM_LIBRARY=OFF"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this removed? We do not want to vendor LLVM.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was removed in the previous PR, I've added it back and updated the flags to keep up with upstream's requirements

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does take less time to compile when you're using the non-vendored LLVM though :^)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, but I reckon most people compiling it from source won't care much about a one-time 10ish minute saving (at least on my hardware)

The majority of users will be grabbing it from cache.nixos.org

I'm open to making this configurable with a default to OFF

@SuperSandro2000
Copy link
Member

Build hangs at [1/4/6 built, 8 copied (48.8/48.9 MiB), 8.3 MiB DL] building clickhouse-20.11.4.13 (buildPhase): [0/2] Re-checking globbed directories...

@RaghavSood
Copy link
Member Author

Clickhouse takes forever to build - you're unlikely to be able to build it locally unless you have a beast of a machine

I'm using AX41 machines, and it still takes 1 hour+

@lukegb
Copy link
Contributor

lukegb commented Dec 6, 2020

Result of nixpkgs-review pr 105968 1

1 package built:
- clickhouse

Copy link
Contributor

@lukegb lukegb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


[nix-shell:~/.cache/nixpkgs-review/pr-105968]$ ./results/clickhouse/bin/clickhouse local --version
ClickHouse client version 20.11.4.13.

[nix-shell:~/.cache/nixpkgs-review/pr-105968]$ ./results/clickhouse/bin/clickhouse server --version
ClickHouse server version 20.11.4.13.

Yup, LG.

@RaghavSood RaghavSood merged commit bb2a7b9 into NixOS:master Dec 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants