diff options
author | MetaDark <kira.bruneau@gmail.com> | 2019-08-21 16:56:11 -0400 |
---|---|---|
committer | MetaDark <kira.bruneau@gmail.com> | 2019-08-31 10:03:32 -0400 |
commit | 5c22c8ba9413405c5f923b3c97825d6542df0372 (patch) | |
tree | 3bea997c9245ed8f6e583c3bb581a1d5fefc42be | |
parent | ccf6d84366cb2ba946c6a0c2914fa9a473bd54e8 (diff) | |
download | nixlib-5c22c8ba9413405c5f923b3c97825d6542df0372.tar nixlib-5c22c8ba9413405c5f923b3c97825d6542df0372.tar.gz nixlib-5c22c8ba9413405c5f923b3c97825d6542df0372.tar.bz2 nixlib-5c22c8ba9413405c5f923b3c97825d6542df0372.tar.lz nixlib-5c22c8ba9413405c5f923b3c97825d6542df0372.tar.xz nixlib-5c22c8ba9413405c5f923b3c97825d6542df0372.tar.zst nixlib-5c22c8ba9413405c5f923b3c97825d6542df0372.zip |
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 f643ecab69d6..775879440ab4 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 { name = "ccls-${version}"; - 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 ee3a4f7d68ea..0d87259effc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9374,8 +9374,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; |