From 0b516052e84c1d9cb48410d127b9cb87d7c213eb Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 7 Nov 2015 19:53:41 +0100
Subject: [PATCH] neovim: collect gui's in one place

---
 .../editors/{neovim-qt/default.nix => neovim/qt.nix}          | 0
 pkgs/top-level/all-packages.nix                               | 4 +++-
 pkgs/top-level/python-packages.nix                            | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename pkgs/applications/editors/{neovim-qt/default.nix => neovim/qt.nix} (100%)

diff --git a/pkgs/applications/editors/neovim-qt/default.nix b/pkgs/applications/editors/neovim/qt.nix
similarity index 100%
rename from pkgs/applications/editors/neovim-qt/default.nix
rename to pkgs/applications/editors/neovim/qt.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17adf2ddaa86..1b7e1a48acec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13223,10 +13223,12 @@ let
     inherit (lua52Packages) lpeg luaMessagePack luabitop;
   };
 
-  neovim-qt = callPackage ../applications/editors/neovim-qt {
+  neovim-qt = callPackage ../applications/editors/neovim/qt.nix {
     qt5 = qt55;
   };
 
+  neovim-pygui = pythonPackages.neovim_gui;
+
   virtviewer = callPackage ../applications/virtualization/virt-viewer {
     gtkvnc = gtkvnc.override { enableGTK3 = true; };
     spice_gtk = spice_gtk.override { enableGTK3 = true; };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b75c9f25096a..7a14acd740d4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20830,7 +20830,7 @@ let
   };
 
   neovim_gui = buildPythonPackage rec {
-    name = "neovim-gui-${self.neovim.version}";
+    name = "neovim-pygui-${self.neovim.version}";
     disabled = !isPy27;
 
     src = self.neovim.src;