public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Neovim: use Python 3.5 again (#15781)

Browse Source 
neovim: use Python 3.5 again
This commit is contained in:
Frederik Rietdijk 2016-05-29 23:31:47 +02:00 committed by Rok Garbas
parent fd9cabe3a3
commit e645389834
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/top-level/all-packages.nix
View File

@ -14457,7 +14457,6 @@ in
neovim = callPackage ../applications/editors/neovim { neovim = callPackage ../applications/editors/neovim {
inherit (lua52Packages) lpeg luaMessagePack luabitop; inherit (lua52Packages) lpeg luaMessagePack luabitop;
python3Packages = python34Packages;
}; };
neovim-qt = callPackage ../applications/editors/neovim/qt.nix { neovim-qt = callPackage ../applications/editors/neovim/qt.nix {

12
pkgs/top-level/python-packages.nix
View File

@ -26350,13 +26350,21 @@ in modules // {
version = "0.1.8"; version = "0.1.8";
name = "neovim-${version}"; name = "neovim-${version}";
disabled = isPy35;
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/n/neovim/${name}.tar.gz"; url = "mirror://pypi/n/neovim/${name}.tar.gz";
sha256 = "06g84f0l208jrc1iqa4vk9kgwr77z1ya8cq39cygpq88yjj28whi"; sha256 = "06g84f0l208jrc1iqa4vk9kgwr77z1ya8cq39cygpq88yjj28whi";
}; };
buildInputs = with self; [ nose ];
checkPhase = ''
nosetests
'';
# Tests require pkgs.neovim,
# which we cannot add because of circular dependency.
doCheck = false;
propagatedBuildInputs = with self; [ msgpack ] propagatedBuildInputs = with self; [ msgpack ]
++ optional (!isPyPy) greenlet ++ optional (!isPyPy) greenlet
++ optional (!isPy34) trollius; ++ optional (!isPy34) trollius;