From 11c3fe2258ab086f582a3377c3d3b572e6ad41f8 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Thu, 6 Sep 2018 14:50:50 -0400 Subject: [PATCH 1/2] pythonPackages.selectors2: init at 2.0.1 Added package becuase now dependency of ncclient. --- .../python-modules/selectors2/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/selectors2/default.nix diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix new file mode 100644 index 000000000000..030178fef830 --- /dev/null +++ b/pkgs/development/python-modules/selectors2/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi +, nose, psutil, mock }: + +buildPythonPackage rec { + version = "2.0.1"; + pname = "selectors2"; + + src = fetchPypi { + inherit pname version; + sha256 = "81b77c4c6f607248b1d6bbdb5935403fef294b224b842a830bbfabb400c81884"; + }; + + checkInputs = [ nose psutil mock ]; + + checkPhase = '' + # https://github.com/NixOS/nixpkgs/pull/46186#issuecomment-419450064 + # Trick to disable certain tests that depend on timing which + # will always fail on hydra + export TRAVIS="" + nosetests tests/test_selectors2.py + ''; + + meta = with stdenv.lib; { + homepage = https://www.github.com/SethMichaelLarson/selectors2; + description = "Back-ported, durable, and portable selectors"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 137463b74db6..3ba3cfa6f2f5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -536,6 +536,8 @@ in { seekpath = callPackage ../development/python-modules/seekpath { }; + selectors2 = callPackage ../development/python-modules/selectors2 { }; + serversyncstorage = callPackage ../development/python-modules/serversyncstorage {}; simpleeval = callPackage ../development/python-modules/simpleeval { }; From a726956b42c92e7a30323d0c3fedbde032db93e3 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Thu, 6 Sep 2018 14:51:24 -0400 Subject: [PATCH 2/2] pythonPackages.ncclient: refactor adding selectors2 as dependency of ncclient. Added recently 20 days ago in August. https://github.com/ncclient/ncclient/commit/8ef20f282877097c8f51604679277db49c39f80c --- pkgs/development/python-modules/ncclient/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 9dc7710ff28f..9933e849d0be 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , paramiko +, selectors2 , lxml , libxml2 , libxslt @@ -21,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ nose rednose ]; propagatedBuildInputs = [ - paramiko lxml libxml2 libxslt + paramiko lxml libxml2 libxslt selectors2 ]; checkPhase = ''