···

       
7
       
7
       
 
       


     

       
8
       
8
       
 
       
stdenv.mkDerivation rec {

     

       
9
       
9
       
 
       
  name = "ycmd-${version}";

     

       
10
       
10
       
-
       
  version = "2017-03-27";

     

       
10
       
10
       
+
       
  version = "2017-11-05";

     

       
11
       
11
       
 
       


     

       
12
       
12
       
 
       
  src = fetchgit {

     

       
13
       
13
       
 
       
    url = "git://github.com/Valloric/ycmd.git";

     

       
14
       
14
       
-
       
    rev = "2ef1ae0d00a06a47fed3aacfd465a310e8bdb0d2";

     

       
15
       
15
       
-
       
    sha256 = "0p5knlxgy66zi229ns1lfdhz5lram93vahmmk54w98fr3h8b1yfj";

     

       
14
       
14
       
+
       
    rev = "0ca16e7ba3a9078b697befdce64104e61829aa3b";

     

       
15
       
15
       
+
       
    sha256 = "0bs94iv521ac2n53n3k8mw3s6v0hi3hhxhjsr0ips3n99al8wndi";

     

       
16
       
16
       
 
       
  };

     

       
17
       
17
       
 
       


     

       
18
       
18
       
 
       
  buildInputs = [ cmake boost ]

     

···

       
1
       
1
       
 
       
diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt

     

       
2
       
2
       
-
       
index 00e4882..8f29797 100644

     

       
2
       
2
       
+
       
index 133c987a..33625271 100644

     

       
3
       
3
       
 
       
--- a/cpp/ycm/CMakeLists.txt

     

       
4
       
4
       
 
       
+++ b/cpp/ycm/CMakeLists.txt

     

       
5
       
5
       
-
       
@@ -310,11 +310,6 @@ if ( EXTERNAL_LIBCLANG_PATH OR USE_SYSTEM_LIBCLANG )

     

       
6
       
6
       
-
       
       # our libraries require, in particular the Python one (from pyenv for

     

       
7
       
7
       
-
       
       # instance).

     

       
8
       
8
       
-
       
       set( CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE )

     

       
9
       
9
       
-
       
-      # When loading our library, the dynamic linker will look for

     

       
10
       
10
       
-
       
-      # libclang.so.4, not libclang.so.4.x.

     

       
11
       
11
       
-
       
-      file( RENAME

     

       
12
       
12
       
-
       
-            ${EXTERNAL_LIBCLANG_PATH}.${CLANG_MAJOR_VERSION}.${CLANG_MINOR_VERSION}

     

       
13
       
13
       
-
       
-            ${EXTERNAL_LIBCLANG_PATH}.${CLANG_MAJOR_VERSION} )

     

       
14
       
14
       
-
       
     endif()

     

       
5
       
5
       
+
       
@@ -359,28 +359,6 @@ if( LIBCLANG_TARGET )

     

       
6
       
6
       
+
       
       POST_BUILD

     

       
7
       
7
       
+
       
       COMMAND ${CMAKE_COMMAND} -E copy "${PATH_TO_LLVM_ROOT}/bin/libclang.dll" "$<TARGET_FILE_DIR:${PROJECT_NAME}>"

     

       
8
       
8
       
+
       
     )

     

       
9
       
9
       
+
       
-  else()

     

       
10
       
10
       
+
       
-    add_custom_command(

     

       
11
       
11
       
+
       
-      TARGET ${PROJECT_NAME}

     

       
12
       
12
       
+
       
-      POST_BUILD

     

       
13
       
13
       
+
       
-      COMMAND ${CMAKE_COMMAND} -E copy "${LIBCLANG_TARGET}" "$<TARGET_FILE_DIR:${PROJECT_NAME}>"

     

       
14
       
14
       
+
       
-    )

     

       
15
       
15
       
+
       
-

     

       
16
       
16
       
+
       
-    if( NOT APPLE )

     

       
17
       
17
       
+
       
-      # When loading our library, the dynamic linker may look for

     

       
18
       
18
       
+
       
-      # libclang.so.x instead of libclang.so.x.y. Create the corresponding

     

       
19
       
19
       
+
       
-      # symlink.

     

       
20
       
20
       
+
       
-      get_filename_component( LIBCLANG_NAME ${LIBCLANG_TARGET} NAME )

     

       
21
       
21
       
+
       
-      string( REGEX REPLACE "([^.]+).([0-9]+).([0-9]+)$" "\\1.\\2"

     

       
22
       
22
       
+
       
-              LIBCLANG_SONAME ${LIBCLANG_NAME} )

     

       
23
       
23
       
+
       
-      add_custom_command(

     

       
24
       
24
       
+
       
-        TARGET ${PROJECT_NAME}

     

       
25
       
25
       
+
       
-        POST_BUILD

     

       
26
       
26
       
+
       
-        COMMAND ${CMAKE_COMMAND} -E create_symlink

     

       
27
       
27
       
+
       
-        "${LIBCLANG_NAME}"

     

       
28
       
28
       
+
       
-        "$<TARGET_FILE_DIR:${PROJECT_NAME}>/${LIBCLANG_SONAME}"

     

       
29
       
29
       
+
       
-      )

     

       
30
       
30
       
+
       
-    endif()

     

       
15
       
31
       
 
       
   endif()

     

       
32
       
32
       
+
       
 endif()

     

       
16
       
33
       
 
       
 

     

···

       
7736
       
7736
       
 
       


     

       
7737
       
7737
       
 
       
  ycmd = callPackage ../development/tools/misc/ycmd {

     

       
7738
       
7738
       
 
       
    inherit (darwin.apple_sdk.frameworks) Cocoa;

     

       
7739
       
7739
       
-
       
    llvmPackages = llvmPackages_4;

     

       
7739
       
7739
       
+
       
    llvmPackages = llvmPackages_5;

     

       
7740
       
7740
       
 
       
    python = python2;

     

       
7741
       
7741
       
 
       
  };

     

       
7742
       
7742