From abc0996dd0e7ccc8c6b67cdd72e948027a52234d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 15:08:42 -0400 Subject: [PATCH] pythonPackages.kazoo: refactor move to pyhton-modules --- .../python-modules/kazoo/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 34 +------------- 2 files changed, 45 insertions(+), 33 deletions(-) create mode 100644 pkgs/development/python-modules/kazoo/default.nix diff --git a/pkgs/development/python-modules/kazoo/default.nix b/pkgs/development/python-modules/kazoo/default.nix new file mode 100644 index 000000000000..ae9d15dd7866 --- /dev/null +++ b/pkgs/development/python-modules/kazoo/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, six +, eventlet +, gevent +, nose +, mock +, coverage +, pkgs +}: + +buildPythonPackage rec { + pname = "kazoo"; + version = "2.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "10pb864if9qi2pq9lfb9m8f7z7ss6rml80gf1d9h64lap5crjnjj"; + }; + + propagatedBuildInputs = [ six ]; + buildInputs = [ eventlet gevent nose mock coverage pkgs.openjdk8 ]; + + # not really needed + preBuild = '' + sed -i '/flake8/d' setup.py + ''; + + preCheck = '' + sed -i 's/test_unicode_auth/noop/' kazoo/tests/test_client.py + ''; + + # tests take a long time to run and leave threads hanging + doCheck = false; + #ZOOKEEPER_PATH = "${pkgs.zookeeper}"; + + meta = with stdenv.lib; { + homepage = "https://kazoo.readthedocs.org"; + description = "Higher Level Zookeeper Client"; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dc74705f5e1a..0d17d417ca47 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3031,39 +3031,7 @@ in { zake = callPackage ../development/python-modules/zake { }; - kazoo = buildPythonPackage rec { - name = "kazoo-${version}"; - version = "2.2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/k/kazoo/${name}.tar.gz"; - sha256 = "10pb864if9qi2pq9lfb9m8f7z7ss6rml80gf1d9h64lap5crjnjj"; - }; - - propagatedBuildInputs = with self; [ - six - ]; - buildInputs = with self; [ - eventlet gevent nose mock coverage pkgs.openjdk8 - ]; - - # not really needed - preBuild = '' - sed -i '/flake8/d' setup.py - ''; - - preCheck = '' - sed -i 's/test_unicode_auth/noop/' kazoo/tests/test_client.py - ''; - - # tests take a long time to run and leave threads hanging - doCheck = false; - #ZOOKEEPER_PATH = "${pkgs.zookeeper}"; - - meta = with stdenv.lib; { - homepage = "https://kazoo.readthedocs.org"; - }; - }; + kazoo = callPackage ../development/python-modules/kazoo { }; FormEncode = callPackage ../development/python-modules/FormEncode { };