From 095ecf7356c0b7b5c1c137897e140e565f814013 Mon Sep 17 00:00:00 2001
From: Evan Stoll <evan.stoll@rjginc.com>
Date: Thu, 10 Dec 2020 16:27:43 -0500
Subject: [PATCH] vncdo: 0.11.2 -> 0.12.0 (#106380)

* Use pythonPackages instead of python2Packages

* Add vncdo to top-level/python-packages so the library can be used by
other Python programs
* Use toPythonApplication for vnc in top-level/all-packages
* run tests if using Python 3+
* move expression to development/python-modules
---
 .../python-modules}/vncdo/default.nix         | 19 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 15 insertions(+), 8 deletions(-)
 rename pkgs/{tools/admin => development/python-modules}/vncdo/default.nix (63%)

diff --git a/pkgs/tools/admin/vncdo/default.nix b/pkgs/development/python-modules/vncdo/default.nix
similarity index 63%
rename from pkgs/tools/admin/vncdo/default.nix
rename to pkgs/development/python-modules/vncdo/default.nix
index 5ca633a944b2..ffc01906f459 100644
--- a/pkgs/tools/admin/vncdo/default.nix
+++ b/pkgs/development/python-modules/vncdo/default.nix
@@ -1,18 +1,23 @@
 { stdenv, fetchFromGitHub
-, python2Packages
+, buildPythonPackage, isPy27
+, pillow
+, twisted
+, pexpect
+, nose
+, ptyprocess
 }:
-python2Packages.buildPythonPackage {
+buildPythonPackage rec {
   pname = "vncdo";
-  version = "0.11.2";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "sibson";
     repo = "vncdotool";
-    rev = "5c03a82dcb5a3bd9e8f741f8a8d0c1ce082f2834";
-    sha256 = "0k03b09ipsz8vp362x7sx7z68mxgqw9qzvkii2f8j9vx2y79rjsh";
+    rev = "v${version}";
+    sha256 = "0h3ccr8zi7xpgn6hz43x1045x5l4bhha7py8x00g8bv6gaqlbwxn";
   };
 
-  propagatedBuildInputs = with python2Packages; [
+  propagatedBuildInputs = [
     pillow
     twisted
     pexpect
@@ -20,7 +25,7 @@ python2Packages.buildPythonPackage {
     ptyprocess
   ];
 
-  doCheck = false;
+  doCheck = !isPy27;
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/sibson/vncdotool";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d764c18e6ee8..db335fb5a22f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8348,7 +8348,7 @@ in
 
   vmtouch = callPackage ../tools/misc/vmtouch { };
 
-  vncdo = callPackage ../tools/admin/vncdo { };
+  vncdo = with python3Packages; toPythonApplication vncdo;
 
   volumeicon = callPackage ../tools/audio/volumeicon { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 625045c1df12..777809fc455d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7700,6 +7700,8 @@ in {
 
   vmprof = callPackage ../development/python-modules/vmprof { };
 
+  vncdo = callPackage ../development/python-modules/vncdo { };
+
   vobject = callPackage ../development/python-modules/vobject { };
 
   voluptuous = callPackage ../development/python-modules/voluptuous { };