From 7076991eec964534ff146bd5af7f772028152d1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 27 Feb 2018 22:06:27 +0100 Subject: [PATCH] pythonPackages.virtual-display: move expression --- .../virtual-display/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +---------------- 2 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/virtual-display/default.nix diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/pkgs/development/python-modules/virtual-display/default.nix new file mode 100644 index 00000000000..0d559c8c88a --- /dev/null +++ b/pkgs/development/python-modules/virtual-display/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, EasyProcess }: + +buildPythonPackage rec { + pname = "PyVirtualDisplay"; + version = "0.1.5"; + + propagatedBuildInputs = [ EasyProcess ]; + + src = fetchPypi { + inherit pname version; + sha256 = "aa6aef08995e14c20cc670d933bfa6e70d736d0b555af309b2e989e2faa9ee53"; + }; + + meta = with lib; { + description = "Python wrapper for Xvfb, Xephyr and Xvnc"; + homepage = "https://github.com/ponty/pyvirtualdisplay"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ layus ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c4ff8feca56..5e5d5582d48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17458,23 +17458,7 @@ in { virtkey = callPackage ../development/python-modules/virtkey { }; - virtual-display = buildPythonPackage rec { - name = "PyVirtualDisplay-0.1.5"; - - propagatedBuildInputs = with self; [ EasyProcess ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/P/PyVirtualDisplay/${name}.tar.gz"; - sha256 = "aa6aef08995e14c20cc670d933bfa6e70d736d0b555af309b2e989e2faa9ee53"; - }; - - meta = { - description = "Python wrapper for Xvfb, Xephyr and Xvnc"; - homepage = "https://github.com/ponty/pyvirtualdisplay"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ layus ]; - }; - }; + virtual-display = callPackage ../development/python-modules/virtual-display { }; virtualenv = callPackage ../development/python-modules/virtualenv { };