From 9ffd373ff1958965ac99566650547a90ad3e410e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 15:37:32 -0400 Subject: [PATCH] pythonPackages.execnet: refactor move to python-modules --- .../python-modules/execnet/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 29 +------------ 2 files changed, 43 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/execnet/default.nix diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix new file mode 100644 index 000000000000..8c2ff6d82f41 --- /dev/null +++ b/pkgs/development/python-modules/execnet/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, setuptools_scm +, apipkg +}: + +buildPythonPackage rec { + pname = "execnet"; + version = "1.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rpk1vyclhg911p3hql0m0nrpq7q7mysxnaaw6vs29cpa6kx8vgn"; + }; + + buildInputs = [ pytest setuptools_scm ]; + propagatedBuildInputs = [ apipkg ]; + + # remove vbox tests + postPatch = '' + rm -v testing/test_termination.py + rm -v testing/test_channel.py + rm -v testing/test_xspec.py + rm -v testing/test_gateway.py + ''; + + checkPhase = '' + py.test testing + ''; + + __darwinAllowLocalNetworking = true; + + meta = with stdenv.lib; { + description = "Rapid multi-Python deployment"; + license = licenses.gpl2; + homepage = "http://codespeak.net/execnet"; + maintainers = with maintainers; [ nand0p ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 345dfa6892ff..208a2e4cc0f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1742,34 +1742,7 @@ in { eyeD3 = callPackage ../development/python-modules/eyed3 { }; - execnet = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "execnet"; - version = "1.4.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/e/${pname}/${name}.tar.gz"; - sha256 = "1rpk1vyclhg911p3hql0m0nrpq7q7mysxnaaw6vs29cpa6kx8vgn"; - }; - buildInputs = with self; [ pytest setuptools_scm ]; - propagatedBuildInputs = with self; [ apipkg ]; - # remove vbox tests - postPatch = '' - rm -v testing/test_termination.py - rm -v testing/test_channel.py - rm -v testing/test_xspec.py - rm -v testing/test_gateway.py - ''; - checkPhase = '' - py.test testing - ''; - __darwinAllowLocalNetworking = true; - meta = { - description = "Rapid multi-Python deployment"; - license = licenses.gpl2; - homepage = "http://codespeak.net/execnet"; - maintainers = with maintainers; [ nand0p ]; - }; - }; + execnet = callPackage ../development/python-modules/execnet { }; ezdxf = callPackage ../development/python-modules/ezdxf {};