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
This commit is contained in:
Evan Stoll 2020-12-10 16:27:43 -05:00 committed by GitHub
parent f8e50c3058
commit 095ecf7356
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 8 deletions

View file

@ -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";

View file

@ -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 { };

View file

@ -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 { };