diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-09-13 16:34:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-13 16:34:32 +0100 |
| commit | a4bea6db8b428309b1e8d33087b778625fac4dfb (patch) | |
| tree | e6568b3dde8deaba7652ed4f3cc976022daa34b7 | |
| parent | b31931adf5093f43834ea6911cf953f6f8c75da7 (diff) | |
| parent | 2e0c19121aa99c7f4fd828a90f9bc6330f1b71b1 (diff) | |
| download | nixlib-a4bea6db8b428309b1e8d33087b778625fac4dfb.tar nixlib-a4bea6db8b428309b1e8d33087b778625fac4dfb.tar.gz nixlib-a4bea6db8b428309b1e8d33087b778625fac4dfb.tar.bz2 nixlib-a4bea6db8b428309b1e8d33087b778625fac4dfb.tar.lz nixlib-a4bea6db8b428309b1e8d33087b778625fac4dfb.tar.xz nixlib-a4bea6db8b428309b1e8d33087b778625fac4dfb.tar.zst nixlib-a4bea6db8b428309b1e8d33087b778625fac4dfb.zip | |
ccls: 0.20190314.1 -> 0.20190823 (#67832)
ccls: 0.20190314.1 -> 0.20190823
| -rw-r--r-- | pkgs/development/tools/misc/ccls/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix index 008701615e72..e42c3e58db8e 100644 --- a/pkgs/development/tools/misc/ccls/default.nix +++ b/pkgs/development/tools/misc/ccls/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ stdenv, fetchFromGitHub , cmake, llvmPackages, rapidjson, runtimeShell }: stdenv.mkDerivation rec { pname = "ccls"; - version = "0.20190314.1"; + version = "0.20190823"; src = fetchFromGitHub { owner = "MaskRay"; repo = "ccls"; rev = version; - sha256 = "1yvxliryqx2bc7r6ri4iafbrjx19jk8hnfbvq5xla72q0gqb97lf"; + sha256 = "1qy1kf83mrvbhwl8m0h7ralwd3sid8y8fpk7pmy81y1nq8f1cf6f"; }; - nativeBuildInputs = [ cmake makeWrapper ]; + nativeBuildInputs = [ cmake ]; buildInputs = with llvmPackages; [ clang-unwrapped llvm rapidjson ]; cmakeFlags = [ - "-DSYSTEM_CLANG=ON" + "-DCCLS_VERSION=${version}" "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4a52e9f419d..2e8b13c687e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9380,8 +9380,8 @@ in ccls = callPackage ../development/tools/misc/ccls { - llvmPackages = llvmPackages_7; - stdenv = llvmPackages_7.stdenv; + llvmPackages = llvmPackages_8; + stdenv = llvmPackages_8.stdenv; }; credstash = with python3Packages; toPythonApplication credstash; |