Merge pull request #22490 from cstrahan/ycmd

ycmd: 2016-01-12 -> 2017-02-03

pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch

···
+diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt
+index 2074c58e..9ecd6e57 100644
+--- a/cpp/ycm/CMakeLists.txt
++++ b/cpp/ycm/CMakeLists.txt
+@@ -366,35 +366,6 @@ if( LIBCLANG_TARGET )
+       POST_BUILD
+       COMMAND ${CMAKE_COMMAND} -E copy "${LIBCLANG_TARGET}" "$<TARGET_FILE_DIR:${PROJECT_NAME}>"
+     )
+-
+-    if( APPLE )
+-      # In OS X El Capitan, Apple introduced System Integrity Protection.
+-      # Amongst other things, this introduces features to the dynamic loader
+-      # (dyld) which cause it to "sanitise" (and complain about) embedded
+-      # LC_RPATH entries which contain @executable_path when then are loaded
+-      # into "restricted" binaries.  For our purposes, "restricted" here means
+-      # "supplied by Apple" and includes the system versions of python.  For
+-      # unknown reasons, the libclang.dylib that comes from llvm.org includes an
+-      # LC_RPATH entry '@executable_path/../lib' which causes the OS X dynamic
+-      # loader to print a cryptic warning to stderr of the form:
+-      #
+-      #    dyld: warning, LC_RPATH @executable_path/../lib in
+-      #    /path/to/ycmd/libclang.dylib being ignored in restricted program
+-      #    because of @executable_path
+-      #
+-      # In order to prevent this harmless and annoying message appearing, we
+-      # simply strip the rpath entry from the dylib.  There's no way any
+-      # @executable_path that python might have could be in any way useful to
+-      # libclang.dylib, so this seems perfectly safe.
+-      get_filename_component( LIBCLANG_TAIL ${LIBCLANG_TARGET} NAME )
+-      add_custom_command( TARGET ${PROJECT_NAME}
+-                          POST_BUILD
+-                          COMMAND install_name_tool
+-                          "-delete_rpath"
+-                          "@executable_path/../lib"
+-                          "$<TARGET_FILE_DIR:${PROJECT_NAME}>/${LIBCLANG_TAIL}"
+-                        )
+-    endif()
+   endif()
+ endif()
+ 

pkgs/development/tools/misc/ycmd/default.nix

···
-{ stdenv, fetchgit, cmake, llvmPackages, boost, python2Packages
+{ stdenv, lib, fetchgit, cmake, llvmPackages, boost, python
+, gocode ? null
+, godef ? null
+, rustracerd ? null
+, Cocoa ? null
 }:
 
-let
-  inherit (python2Packages) python mkPythonDerivation waitress frozendict bottle;
-in mkPythonDerivation rec {
-  name = "ycmd-2016-01-12";
-  namePrefix = "";
+stdenv.mkDerivation rec {
+  name = "ycmd-${version}";
+  version = "2017-02-03";
 
   src = fetchgit {
     url = "git://github.com/Valloric/ycmd.git";
-    rev = "f982f6251c5ff85e3abe6e862aad8bcd19e85ece";
-    sha256 = "1g0hivv3wla7z5dgnkcn3ny38p089pjfj36nx6k29zmprgmjinyr";
+    rev = "ec7a154f8fe50c071ecd0ac6841de8a50ce92f5d";
+    sha256 = "0rzxgqqqmmrv9r4k2ji074iprhw6sb0jkvh84wvi45yfyphsh0xi";
   };
 
-  buildInputs = [ cmake boost ];
-
-  propagatedBuildInputs = [ waitress frozendict bottle ];
+  buildInputs = [ cmake boost ]  ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
 
   buildPhase = ''
     export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped}
     ${python.interpreter} build.py --clang-completer --system-boost
   '';
 
+  patches = [ ./2-ycm-cmake.patch ];
+
   configurePhase = ":";
 
+  # remove the tests
+  #
+  # make __main__.py executable and add shebang
+  #
+  # copy over third-party libs
+  # note: if we switch to using our packaged libs, we'll need to symlink them
+  # into the same spots, as YouCompleteMe (the vim plugin) expects those paths
+  # to be available
+  #
+  # symlink completion backends where ycmd expects them
   installPhase = ''
-    mkdir -p $out/lib/ycmd/third_party $out/bin
-    cp -r ycmd/ CORE_VERSION libclang.so.* ycm_client_support.so ycm_core.so $out/lib/ycmd/
+    rm -rf ycmd/tests
+
+    chmod +x ycmd/__main__.py
+    sed -i "1i #!${python.interpreter}\
+    " ycmd/__main__.py
+
+    mkdir -p $out/lib/ycmd
+    cp -r ycmd/ CORE_VERSION libclang.so.* ycm_core.so $out/lib/ycmd/
+
+    mkdir -p $out/bin
     ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd
+
+    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
+      cp -r third_party/$p $out/lib/ycmd/third_party
+    done
+
+  '' + lib.optionalString (gocode != null) ''
+    ln -s ${gocode}/bin/gocode $out/lib/ycmd/third_party/gocode
+  '' + lib.optionalString (godef != null) ''
+    ln -s ${godef}/bin/godef $out/lib/ycmd/third_party/godef
+  '' + lib.optionalString (rustracerd != null) ''
+    ln -s ${rustracerd}/bin/racerd $out/lib/ycmd/third_party/racerd/target/release
+  '';
+
+  # fixup the argv[0] and replace __file__ with the corresponding path so
+  # python won't be thrown off by argv[0]
+  postFixup = ''
+    substituteInPlace $out/lib/ycmd/ycmd/__main__.py \
+      --replace $out/lib/ycmd/ycmd/__main__.py \
+                $out/bin/ycmd \
+      --replace __file__ \
+                "'$out/lib/ycmd/ycmd/__main__.py'"
   '';
 
   meta = with stdenv.lib; {
     description = "A code-completion and comprehension server";
     homepage = https://github.com/Valloric/ycmd;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ rasendubi ];
+    maintainers = with maintainers; [ rasendubi cstrahan ];
     platforms = platforms.all;
   };
 }

pkgs/top-level/all-packages.nix

···
 
   yacc = bison;
 
-  ycmd = callPackage ../development/tools/misc/ycmd { };
+  ycmd = callPackage ../development/tools/misc/ycmd {
+    inherit (darwin.apple_sdk.frameworks) Cocoa;
+    python = python2;
+  };
 
   yodl = callPackage ../development/tools/misc/yodl { };