diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-07-25 23:26:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-25 23:26:36 +0200 |
| commit | 3290f1d42acad22b4735367747305e6e1c9250f4 (patch) | |
| tree | 064181b0a2ece0371b18bb4305284c273364ebcb /pkgs | |
| parent | 8d630b308752dbdb8b746d2ae986b7c388dd8ac3 (diff) | |
| parent | 4eb70fbd22217e35e3970c664f975f1674155826 (diff) | |
| download | nixlib-3290f1d42acad22b4735367747305e6e1c9250f4.tar nixlib-3290f1d42acad22b4735367747305e6e1c9250f4.tar.gz nixlib-3290f1d42acad22b4735367747305e6e1c9250f4.tar.bz2 nixlib-3290f1d42acad22b4735367747305e6e1c9250f4.tar.lz nixlib-3290f1d42acad22b4735367747305e6e1c9250f4.tar.xz nixlib-3290f1d42acad22b4735367747305e6e1c9250f4.tar.zst nixlib-3290f1d42acad22b4735367747305e6e1c9250f4.zip | |
Merge pull request #44063 from LnL7/ycmd-fix-jedi
ycmd: 2018-06-14 -> 2018-07-24
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/misc/ycmd/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/default.nix | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 2eb9b453661b..c0e12aa22c44 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 = "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 diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index b52e63241990..8a9580d99e17 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -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 |