lol

ycmd: 2017-02-03 -> 2017-03-27

Now works with newer version of vim youcompleteme plugin.

Details:
- The OS X patch is no longer necessary as that code was removed upstream.
- It seems to want LLVM version 4 now.
- It annoyingly wants to symlink libclang.4 to libclang.4.0; nix already
did this.

+21 -42
-37
pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch
··· 1 - diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt 2 - index 2074c58e..9ecd6e57 100644 3 - --- a/cpp/ycm/CMakeLists.txt 4 - +++ b/cpp/ycm/CMakeLists.txt 5 - @@ -335,7 +335,7 @@ 6 - COMMAND ${CMAKE_COMMAND} -E copy "${LIBCLANG_TARGET}" "$<TARGET_FILE_DIR:${PROJECT_NAME}>" 7 - ) 8 - 9 - - if( APPLE ) 10 - + #if( APPLE ) 11 - # In OS X El Capitan, Apple introduced System Integrity Protection. 12 - # Amongst other things, this introduces features to the dynamic loader 13 - # (dyld) which cause it to "sanitise" (and complain about) embedded 14 - @@ -354,15 +354,15 @@ 15 - # simply strip the rpath entry from the dylib. There's no way any 16 - # @executable_path that python might have could be in any way useful to 17 - # libclang.dylib, so this seems perfectly safe. 18 - - get_filename_component( LIBCLANG_TAIL ${LIBCLANG_TARGET} NAME ) 19 - - add_custom_command( TARGET ${PROJECT_NAME} 20 - - POST_BUILD 21 - - COMMAND install_name_tool 22 - - "-delete_rpath" 23 - - "@executable_path/../lib" 24 - - "$<TARGET_FILE_DIR:${PROJECT_NAME}>/${LIBCLANG_TAIL}" 25 - - ) 26 - - endif() 27 - + # get_filename_component( LIBCLANG_TAIL ${LIBCLANG_TARGET} NAME ) 28 - + #add_custom_command( TARGET ${PROJECT_NAME} 29 - + # POST_BUILD 30 - + # COMMAND install_name_tool 31 - + # "-delete_rpath" 32 - + # "@executable_path/../lib" 33 - + # "$<TARGET_FILE_DIR:${PROJECT_NAME}>/${LIBCLANG_TAIL}" 34 - + # ) 35 - + # endif() 36 - endif() 37 - endif()
+4 -4
pkgs/development/tools/misc/ycmd/default.nix
··· 7 7 8 8 stdenv.mkDerivation rec { 9 9 name = "ycmd-${version}"; 10 - version = "2017-02-03"; 10 + version = "2017-03-27"; 11 11 12 12 src = fetchgit { 13 13 url = "git://github.com/Valloric/ycmd.git"; 14 - rev = "ec7a154f8fe50c071ecd0ac6841de8a50ce92f5d"; 15 - sha256 = "0rzxgqqqmmrv9r4k2ji074iprhw6sb0jkvh84wvi45yfyphsh0xi"; 14 + rev = "2ef1ae0d00a06a47fed3aacfd465a310e8bdb0d2"; 15 + sha256 = "0p5knlxgy66zi229ns1lfdhz5lram93vahmmk54w98fr3h8b1yfj"; 16 16 }; 17 17 18 18 buildInputs = [ cmake boost ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; ··· 22 22 ${python.interpreter} build.py --clang-completer --system-boost 23 23 ''; 24 24 25 - patches = [ ./2-ycm-cmake.patch ]; 25 + patches = [ ./dont-symlink-clang.patch ]; 26 26 27 27 configurePhase = ":"; 28 28
+1 -1
pkgs/top-level/all-packages.nix
··· 6992 6992 6993 6993 ycmd = callPackage ../development/tools/misc/ycmd { 6994 6994 inherit (darwin.apple_sdk.frameworks) Cocoa; 6995 - llvmPackages = llvmPackages_39; 6995 + llvmPackages = llvmPackages_4; 6996 6996 python = python2; 6997 6997 }; 6998 6998