From 5a0665846ed4f3c742b3ff1c7336b0b387f180b7 Mon Sep 17 00:00:00 2001
From: "Kovacsics Robert (NixOS)" <kovirobi@gmail.com>
Date: Mon, 14 Nov 2016 20:36:59 +0000
Subject: [PATCH] plover: move out of python-packages.nix

---
 pkgs/applications/misc/plover/default.nix | 26 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 pkgs/top-level/python-packages.nix        | 27 -----------------------
 3 files changed, 28 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/applications/misc/plover/default.nix

diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
new file mode 100644
index 00000000000..b8fa38268c3
--- /dev/null
+++ b/pkgs/applications/misc/plover/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, python27Packages, wmctrl }:
+
+python27Packages.buildPythonPackage rec {
+  name = "plover-${version}";
+  version = "3.1.0";
+
+  meta = with stdenv.lib; {
+    description = "OpenSteno Plover stenography software";
+    maintainers = with maintainers; [ twey kovirobi ];
+    license = licenses.gpl2;
+  };
+
+  src = fetchurl {
+    url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz";
+    sha256 = "1zdlgyjp93sfvk6by7rsh9hj4ijzplglrxpcpkcir6c3nq2bixl4";
+  };
+
+  # This is a fix for https://github.com/pypa/pip/issues/3624 causing regression https://github.com/pypa/pip/issues/3781
+  postPatch = ''
+    substituteInPlace setup.py --replace " in sys_platform" " == sys_platform"
+    '';
+
+  buildInputs = with python27Packages; [ pytest mock ];
+  propagatedBuildInputs = with python27Packages; [ six setuptools pyserial appdirs hidapi
+    wxPython xlib wmctrl ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cb32f3ce4d..e16ab3922dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14158,6 +14158,8 @@ in
     gtksharp = gtk-sharp-2_0;
   };
 
+  plover = callPackage ../applications/misc/plover { };
+
   plugin-torture = callPackage ../applications/audio/plugin-torture { };
 
   pmenu = callPackage ../applications/misc/pmenu { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3b95a5f896c..1e84a6a9a39 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14878,33 +14878,6 @@ in {
     };
   };
 
-
-  plover = buildPythonPackage rec {
-    name = "plover-${version}";
-    version = "3.1.0";
-    disabled = !isPy27;
-
-    meta = {
-      description = "OpenSteno Plover stenography software";
-      maintainers = with maintainers; [ twey kovirobi ];
-      license = licenses.gpl2;
-    };
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz";
-      sha256 = "1zdlgyjp93sfvk6by7rsh9hj4ijzplglrxpcpkcir6c3nq2bixl4";
-    };
-
-    # This is a fix for https://github.com/pypa/pip/issues/3624 causing regression https://github.com/pypa/pip/issues/3781
-    postPatch = ''
-     substituteInPlace setup.py --replace " in sys_platform" " == sys_platform"
-    '';
-
-    buildInputs = with self; [ pytest mock ];
-    propagatedBuildInputs = with self; [ six setuptools pyserial appdirs hidapi
-                                         wxPython xlib pkgs.wmctrl ];
-  };
-
   pygal = buildPythonPackage rec {
     version = "2.0.10";
     name = "pygal-${version}";