diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 5f90525feca..2eb9b453661 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "ycmd-${version}"; - version = "2017-11-05"; + version = "2018-06-14"; src = fetchgit { - url = "git://github.com/Valloric/ycmd.git"; - rev = "0ca16e7ba3a9078b697befdce64104e61829aa3b"; - sha256 = "0bs94iv521ac2n53n3k8mw3s6v0hi3hhxhjsr0ips3n99al8wndi"; + url = "https://github.com/Valloric/ycmd.git"; + rev = "29e36f74f749d10b8d6ce285c1453fac26f15a41"; + sha256 = "0s62nf18jmgjihyba7lk7si8xrxsg60whdr430nlb5gjikag8zr5"; }; nativeBuildInputs = [ cmake ]; @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { ${python.interpreter} build.py --system-libclang --clang-completer --system-boost ''; - patches = [ ./dont-symlink-clang.patch ]; - configurePhase = ":"; # remove the tests @@ -53,8 +51,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/ycmd/third_party/{gocode,godef,racerd/target/release} - cp -r third_party/JediHTTP $out/lib/ycmd/third_party - for p in waitress frozendict bottle python-future argparse requests; do + for p in jedi waitress frozendict bottle python-future requests; do cp -r third_party/$p $out/lib/ycmd/third_party done diff --git a/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch b/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch deleted file mode 100644 index 6199758de52..00000000000 --- a/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt -index 133c987a..33625271 100644 ---- a/cpp/ycm/CMakeLists.txt -+++ b/cpp/ycm/CMakeLists.txt -@@ -359,28 +359,6 @@ if( LIBCLANG_TARGET ) - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy "${PATH_TO_LLVM_ROOT}/bin/libclang.dll" "$" - ) -- else() -- add_custom_command( -- TARGET ${PROJECT_NAME} -- POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy "${LIBCLANG_TARGET}" "$" -- ) -- -- if( NOT APPLE ) -- # When loading our library, the dynamic linker may look for -- # libclang.so.x instead of libclang.so.x.y. Create the corresponding -- # symlink. -- get_filename_component( LIBCLANG_NAME ${LIBCLANG_TARGET} NAME ) -- string( REGEX REPLACE "([^.]+).([0-9]+).([0-9]+)$" "\\1.\\2" -- LIBCLANG_SONAME ${LIBCLANG_NAME} ) -- add_custom_command( -- TARGET ${PROJECT_NAME} -- POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E create_symlink -- "${LIBCLANG_NAME}" -- "$/${LIBCLANG_SONAME}" -- ) -- endif() - endif() - endif() -