diff options
| -rw-r--r-- | third_party/default.nix | 1 | ||||
| -rw-r--r-- | third_party/nix/default.nix | 7 | ||||
| -rw-r--r-- | third_party/nix/src/tests/value-to-json.cc | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/third_party/default.nix b/third_party/default.nix index f9b963f152ee..d1fd9f370f02 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -65,6 +65,7 @@ let diffutils dockerTools execline + fd fetchFromGitHub fetchgit fetchurl diff --git a/third_party/nix/default.nix b/third_party/nix/default.nix index cceb6b4f1bd5..1ab729e43af5 100644 --- a/third_party/nix/default.nix +++ b/third_party/nix/default.nix @@ -37,9 +37,9 @@ in pkgs.llvmPackages.libcxxStdenv.mkDerivation { bison clang-tools cmake - pkgconfig libxml2 libxslt + pkgconfig (import ./clangd.nix pkgs) ]; @@ -67,6 +67,7 @@ in pkgs.llvmPackages.libcxxStdenv.mkDerivation { doInstallCheck = true; installCheckInputs = with pkgs; [ + fd gtest rapidcheck ]; @@ -91,6 +92,10 @@ in pkgs.llvmPackages.libcxxStdenv.mkDerivation { export NIX_DATA_DIR=$out/share export NIX_TEST_VAR=foo # this is required by a language test make test + + # Ensure formatting is coherent, but do this after the rest of the + # tests run so that developers get all the useful feedback + fd . $src -e hh -e cc | xargs clang-format --dry-run --Werror ''; preBuild = '' diff --git a/third_party/nix/src/tests/value-to-json.cc b/third_party/nix/src/tests/value-to-json.cc index fddeae512b69..573eb658285d 100644 --- a/third_party/nix/src/tests/value-to-json.cc +++ b/third_party/nix/src/tests/value-to-json.cc @@ -8,7 +8,6 @@ #include "libexpr/value-to-xml.hh" #include "libexpr/value.hh" #include "libstore/store-api.hh" - #include "tests/dummy-store.hh" class ValueTest : public ::testing::Test { |