mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(3p/nix): Fix dependency inclusion and reenable CI

Browse source 
Change-Id: Ic2b7db4abe636b73b4c71e6a2f1501d3b4b8b90e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2922
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Vincent Ambo 2021-04-10 23:20:55 +02:00 committed by tazjin
parent 473604f567
commit a5d8f5273c
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
third_party/nix/default.nix vendored
View file

@ -73,8 +73,8 @@ in lib.fix (self: pkgs.llvmPackages.libcxxStdenv.mkDerivation {
(import ./clangd.nix pkgs) (import ./clangd.nix pkgs)
]; ];
# TODO(tazjin): Some of these might only be required for native inputs # TODO(tazjin): Some of these might only be required for native inputs
buildInputs = with pkgs; [ buildInputs = (with pkgs; [
aws-s3-cpp aws-s3-cpp
brotli brotli
bzip2 bzip2
@ -88,7 +88,7 @@ in lib.fix (self: pkgs.llvmPackages.libcxxStdenv.mkDerivation {
openssl openssl
sqlite sqlite
xz xz
] ++ (with depot.third_party; [ ]) ++ (with depot.third_party; [
abseil_cpp abseil_cpp
glog glog
grpc grpc
@ -101,9 +101,9 @@ in lib.fix (self: pkgs.llvmPackages.libcxxStdenv.mkDerivation {
# Preserve debug symbols, for core dumps + other live debugging # Preserve debug symbols, for core dumps + other live debugging
dontStrip = true; dontStrip = true;
installCheckInputs = with pkgs; [ installCheckInputs = with depot.third_party; [
depot.third_party.gtest gtest
fd pkgs.fd
rapidcheck rapidcheck
]; ];
@ -188,9 +188,6 @@ in lib.fix (self: pkgs.llvmPackages.libcxxStdenv.mkDerivation {
# TODO(tazjin): integration test setup? # TODO(tazjin): integration test setup?
# TODO(tazjin): docs generation? # TODO(tazjin): docs generation?
# TODO(tazjin): Sort out after CL/2910 lands
meta.ci = false;
passthru = { passthru = {
build-shell = self.overrideAttrs (up: rec { build-shell = self.overrideAttrs (up: rec {
run_clang_tidy = pkgs.writeShellScriptBin "run-clang-tidy" '' run_clang_tidy = pkgs.writeShellScriptBin "run-clang-tidy" ''