MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #44063 from LnL7/ycmd-fix-jedi

Browse source 
ycmd: 2018-06-14 -> 2018-07-24
This commit is contained in:
Daiderd Jordan 2018-07-25 23:26:36 +02:00 committed by GitHub
commit 3290f1d42a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/tools/misc/ycmd/default.nix
View file

@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
name = "ycmd-${version}";
version = "2018-06-14";
version = "2018-07-24";
src = fetchgit {
url = "https://github.com/Valloric/ycmd.git";
rev = "29e36f74f749d10b8d6ce285c1453fac26f15a41";
sha256 = "0s62nf18jmgjihyba7lk7si8xrxsg60whdr430nlb5gjikag8zr5";
rev = "f8a8b04892b925efeee24298a957cc6d6a69ad06";
sha256 = "1br2sh6bs0fg1axq2hq9f48fz8klkzydi1mf0j0jdsh3zjzkmxbn";
};
nativeBuildInputs = [ cmake ];
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/lib/ycmd/third_party/{gocode,godef,racerd/target/release}
for p in jedi waitress frozendict bottle python-future requests; do
for p in jedi waitress frozendict bottle parso python-future requests; do
cp -r third_party/$p $out/lib/ycmd/third_party
done

8
pkgs/misc/vim-plugins/default.nix
View file

@ -2848,11 +2848,11 @@ let
};
youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "youcompleteme-2018-06-20";
name = "youcompleteme-2018-07-24";
src = fetchgit {
url = "https://github.com/valloric/youcompleteme";
rev = "e1ead995c13fe20989ee3d69fd76b20c5fff5d5b";
sha256 = "01my9m7a5m24zrh6i867fhqz42jxs0ai2pl4pra8wzvyk4ai1p5f";
rev = "459b3e620e45191b15c48c66b02ff89f1a0674db";
sha256 = "0s4sndx0mm13xcb559agfcqqdwhp2sr7kpp4ksc9gx41k7626rdr";
};
dependencies = [];
buildPhase = ''
@ -3259,7 +3259,7 @@ let
sha256 = "0hj5bhfhd9am11ixaxad370p982bjig53mbm74fi6slhjpikdrdq";
};
dependencies = [];
buildInputs = [ python3 ];
buildInputs = [ python3 ];
buildPhase = ''
pushd ./rplugin/python3/deoplete/ujson
python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build