cquery: remove

This commit is contained in:
Jörg Thalheim 2020-06-15 08:33:32 +01:00
parent 63d98cab9b
commit 7c68f54d95
No known key found for this signature in database
GPG key ID: 003F2096411B5F92
4 changed files with 1 additions and 82 deletions

View file

@ -1,64 +0,0 @@
{ fetchFromGitHub, makeWrapper
, cmake, llvmPackages, ncurses
, runtimeShell }:
let
src = fetchFromGitHub {
owner = "cquery-project";
repo = "cquery";
rev = "a95a6503d68a85baa25465ce147b7fc20f4a552e";
sha256 = "0rxbdln7dqkdw4q8rhclssgwypq16g9flkwmaabsr8knckbszxrx";
fetchSubmodules = true;
};
stdenv = llvmPackages.stdenv;
in
stdenv.mkDerivation {
pname = "cquery";
version = "2018-10-14";
inherit src;
nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = with llvmPackages; [ clang clang-unwrapped llvm ncurses ];
cmakeFlags = [
"-DSYSTEM_CLANG=ON"
"-DCLANG_CXX=ON"
];
shell = runtimeShell;
postFixup = ''
# We need to tell cquery where to find the standard library headers.
standard_library_includes="\\\"-isystem\\\", \\\"${stdenv.lib.getDev stdenv.cc.libc}/include\\\""
standard_library_includes+=", \\\"-isystem\\\", \\\"${llvmPackages.libcxx}/include/c++/v1\\\""
export standard_library_includes
wrapped=".cquery-wrapped"
export wrapped
mv $out/bin/cquery $out/bin/$wrapped
substituteAll ${./wrapper} $out/bin/cquery
chmod --reference=$out/bin/$wrapped $out/bin/cquery
'';
doInstallCheck = true;
installCheckPhase = ''
pushd ${src}
$out/bin/cquery --ci --test-unit
# The integration tests have to be disabled because cquery ignores `--init`
# if they are invoked, which means it won't find the system includes.
#$out/bin/cquery --ci --test-index
'';
meta = with stdenv.lib; {
description = "A c/c++ language server powered by libclang";
homepage = "https://github.com/cquery-project/cquery";
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
maintainers = [ maintainers.tobim ];
};
}

View file

@ -1,12 +0,0 @@
#! @shell@ -e
initString="--init={\"cacheDirectory\": \"/tmp/cquery\", \"extraClangArguments\": [@standard_library_includes@"
if [ "${NIX_CFLAGS_COMPILE}" != "" ]; then
read -a cflags_array <<< ${NIX_CFLAGS_COMPILE}
initString+=$(printf ', \"%s\"' "${cflags_array[@]}")
fi
initString+="]}"
exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "$@"

View file

@ -88,6 +88,7 @@ mapAliases ({
cpp-gsl = microsoft_gsl; # added 2019-05-24
cupsBjnp = cups-bjnp; # added 2016-01-02
cups_filters = cups-filters; # added 2016-08
cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # added 2020-06-15
cv = progress; # added 2015-09-06
d1x_rebirth = dxx-rebirth; # added 2018-04-25
d2x_rebirth = dxx-rebirth; # added 2018-04-25

View file

@ -10274,12 +10274,6 @@ in
cpplint = callPackage ../development/tools/analysis/cpplint { };
cquery = callPackage ../development/tools/misc/cquery {
# 7 is the default, but only on Linux, so keep this for now
llvmPackages = llvmPackages_7;
};
ccls = callPackage ../development/tools/misc/ccls {
llvmPackages = llvmPackages_8;
stdenv = llvmPackages_8.stdenv;