diff options
author | Alexey Shmalko <rasen.dubi@gmail.com> | 2018-12-09 01:45:10 +0200 |
---|---|---|
committer | Alexey Shmalko <rasen.dubi@gmail.com> | 2018-12-10 23:19:45 +0200 |
commit | bc51418f1add4ba47a87c9b3fd698676577a8384 (patch) | |
tree | b72829a418137682db85bbec465b023ef7b1d478 /pkgs | |
parent | 211938532cc788d9dadbb9b14d0845e4576dfeb4 (diff) | |
download | nixlib-bc51418f1add4ba47a87c9b3fd698676577a8384.tar nixlib-bc51418f1add4ba47a87c9b3fd698676577a8384.tar.gz nixlib-bc51418f1add4ba47a87c9b3fd698676577a8384.tar.bz2 nixlib-bc51418f1add4ba47a87c9b3fd698676577a8384.tar.lz nixlib-bc51418f1add4ba47a87c9b3fd698676577a8384.tar.xz nixlib-bc51418f1add4ba47a87c9b3fd698676577a8384.tar.zst nixlib-bc51418f1add4ba47a87c9b3fd698676577a8384.zip |
neovim-pygui: remove
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/editors/neovim/wrapper.nix | 7 | ||||
-rw-r--r-- | pkgs/development/python-modules/neovim_gui/default.nix | 35 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
4 files changed, 1 insertions, 45 deletions
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 5e57fe4d141d..3dd3710da772 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -16,7 +16,6 @@ let , withPython3 ? true, extraPython3Packages ? (_: []) /* the function you would have passed to python.withPackages */ , withNodeJs? false , withRuby ? true - , withPyGUI ? false , vimAlias ? false , viAlias ? false , configure ? {} @@ -43,7 +42,7 @@ let pluginPythonPackages = getDeps "pythonDependencies" requiredPlugins; pythonEnv = pythonPackages.python.withPackages(ps: - (if withPyGUI then [ ps.neovim_gui ] else [ ps.pynvim ]) + [ ps.pynvim ] ++ (extraPythonPackagesFun ps) ++ (concatMap (f: f ps) pluginPythonPackages)); @@ -88,10 +87,6 @@ let makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH '' + optionalString withRuby '' ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby - '' - + optionalString withPyGUI '' - makeWrapper "${pythonEnv}/bin/pynvim" "$out/bin/pynvim" \ - --prefix PATH : "$out/bin" '' + optionalString vimAlias '' ln -s $out/bin/nvim $out/bin/vim '' + optionalString viAlias '' diff --git a/pkgs/development/python-modules/neovim_gui/default.nix b/pkgs/development/python-modules/neovim_gui/default.nix deleted file mode 100644 index e6d36a370890..000000000000 --- a/pkgs/development/python-modules/neovim_gui/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitHub -, neovim -, click -, pygobject3 -, isPy27 -, pkgs -}: - -buildPythonPackage rec { - pname = "neovim-pygui"; - version = "0.1.3"; - disabled = !isPy27; - - src = fetchFromGitHub { - owner = "neovim"; - repo = "python-gui"; - rev = version; - sha256 = "1vpvr3zm3f9sxg1z1cl7f7gi8v1xksjdvxj62qnw65aqj3zqxnkz"; - }; - - propagatedBuildInputs = [ neovim click pygobject3 pkgs.gobject-introspection pkgs.makeWrapper pkgs.gtk3 ]; - - patchPhase = '' - sed -i -e "s|entry_points=entry_points,|entry_points=dict(console_scripts=['pynvim=neovim.ui.cli:main [GUI]']),|" setup.py - ''; - - postInstall = '' - wrapProgram $out/bin/pynvim \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix PYTHONPATH : "${pygobject3}/lib/python2.7/site-packages:$PYTHONPATH" - ''; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a36113b642dc..8a8122792f44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19622,8 +19622,6 @@ in neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; - neovim-pygui = pythonPackages.neovim_gui; - neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { pythonPackages = python3Packages; }; vis = callPackage ../applications/editors/vis { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 71c33965cd7a..8e19f6ec6a94 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4629,8 +4629,6 @@ in { pynvim = callPackage ../development/python-modules/pynvim {}; - neovim_gui = callPackage ../development/python-modules/neovim_gui { }; - typogrify = callPackage ../development/python-modules/typogrify { }; smartypants = callPackage ../development/python-modules/smartypants { }; |