about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2020-06-15 08:33:32 +0100
committerJörg Thalheim <joerg@thalheim.io>2020-06-15 20:48:56 +0100
commit7c68f54d9526bd2d83853ca916cc01a0490f661c (patch)
tree61a863b5d62d1880bc34790f5f6b983a15bd613e /pkgs/top-level
parent63d98cab9badccc2c76dc16b15a3c68e0b7eca4e (diff)
downloadnixlib-7c68f54d9526bd2d83853ca916cc01a0490f661c.tar
nixlib-7c68f54d9526bd2d83853ca916cc01a0490f661c.tar.gz
nixlib-7c68f54d9526bd2d83853ca916cc01a0490f661c.tar.bz2
nixlib-7c68f54d9526bd2d83853ca916cc01a0490f661c.tar.lz
nixlib-7c68f54d9526bd2d83853ca916cc01a0490f661c.tar.xz
nixlib-7c68f54d9526bd2d83853ca916cc01a0490f661c.tar.zst
nixlib-7c68f54d9526bd2d83853ca916cc01a0490f661c.zip
cquery: remove
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix6
2 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 03efd40d2714..92f4f0fa414b 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 2b75778322fe..c19a89edf500 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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;