diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-06-15 21:39:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-15 21:39:44 +0100 |
commit | 448a27759eea51b2d9e9fca82ceeb479f17c10eb (patch) | |
tree | 473d5f127ca35a9d754f03f3254207d7b2d841ec /pkgs | |
parent | f676408e8c769c6505637745853a5964f7e3b092 (diff) | |
parent | 7c68f54d9526bd2d83853ca916cc01a0490f661c (diff) | |
download | nixlib-448a27759eea51b2d9e9fca82ceeb479f17c10eb.tar nixlib-448a27759eea51b2d9e9fca82ceeb479f17c10eb.tar.gz nixlib-448a27759eea51b2d9e9fca82ceeb479f17c10eb.tar.bz2 nixlib-448a27759eea51b2d9e9fca82ceeb479f17c10eb.tar.lz nixlib-448a27759eea51b2d9e9fca82ceeb479f17c10eb.tar.xz nixlib-448a27759eea51b2d9e9fca82ceeb479f17c10eb.tar.zst nixlib-448a27759eea51b2d9e9fca82ceeb479f17c10eb.zip |
Merge pull request #90455 from Mic92/cquery
cquery: remove
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/misc/cquery/default.nix | 64 | ||||
-rw-r--r-- | pkgs/development/tools/misc/cquery/wrapper | 12 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
4 files changed, 1 insertions, 82 deletions
diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix deleted file mode 100644 index 33a8bf1df61d..000000000000 --- a/pkgs/development/tools/misc/cquery/default.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/development/tools/misc/cquery/wrapper b/pkgs/development/tools/misc/cquery/wrapper deleted file mode 100644 index 8b3e57290429..000000000000 --- a/pkgs/development/tools/misc/cquery/wrapper +++ /dev/null @@ -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}" "$@" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2212c49c715f..e502fab10d7c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2d8893f2060..ae44ac84e77b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10276,12 +10276,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; |