From 967d7610a060d840ad0d688102c8f3b79fcde4f2 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 2 Sep 2021 11:59:41 -0300 Subject: [PATCH 1/4] python3Packages.jaeger-client: init 4.6.1 --- .../python-modules/jaeger-client/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/jaeger-client/default.nix diff --git a/pkgs/development/python-modules/jaeger-client/default.nix b/pkgs/development/python-modules/jaeger-client/default.nix new file mode 100644 index 00000000000..05a76333af0 --- /dev/null +++ b/pkgs/development/python-modules/jaeger-client/default.nix @@ -0,0 +1,40 @@ +{ buildPythonPackage +, fetchPypi +, lib +, opentracing +, threadloop +, thrift +, tornado +}: + +buildPythonPackage rec { + pname = "jaeger-client"; + version = "4.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "3bc27ad77e035efd0899f377a15f180467fec44b2afbf5be0660cc888a2a4ac3"; + }; + + propagatedBuildInputs = [ + threadloop + thrift + tornado + opentracing + ]; + + # FIXME: Missing dependencies: tchannel, opentracing_instrumentation + # opentracing_instrumentation: Requires "tornado" lower than 6. Current is 6.1. + # https://github.com/uber-common/opentracing-python-instrumentation/pull/115 + doCheck = false; + + pythonImportsCheck = [ "jaeger_client" ]; + + meta = with lib; { + description = "Jaeger bindings for Python OpenTracing API"; + downloadPage = "https://pypi.org/project/jaeger-client/"; + homepage = "https://github.com/jaegertracing/jaeger-client-python"; + license = licenses.asl20; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 61cadea5f26..6bdfa2c8ca8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3833,6 +3833,8 @@ in { j2cli = callPackage ../development/python-modules/j2cli { }; + jaeger-client = callPackage ../development/python-modules/jaeger-client { }; + janus = callPackage ../development/python-modules/janus { }; jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; From f5a5a3e95c3b403fe0dd61bdb219cfbc99d0d978 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 2 Sep 2021 12:10:38 -0300 Subject: [PATCH 2/4] python3Packages.threadloop: init 1.0.2 --- .../python-modules/threadloop/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/threadloop/default.nix diff --git a/pkgs/development/python-modules/threadloop/default.nix b/pkgs/development/python-modules/threadloop/default.nix new file mode 100644 index 00000000000..4a4a781cac9 --- /dev/null +++ b/pkgs/development/python-modules/threadloop/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage +, fetchPypi +, lib +, tornado +}: + +buildPythonPackage rec { + pname = "threadloop"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "8b180aac31013de13c2ad5c834819771992d350267bddb854613ae77ef571944"; + }; + + propagatedBuildInputs = [ + tornado + ]; + + doCheck = false; # ImportError: cannot import name 'ThreadLoop' from 'threadloop' + + pythonImportsCheck = [ "threadloop" ]; + + meta = with lib; { + description = "A library to run tornado coroutines from synchronous Python"; + homepage = "https://github.com/GoodPete/threadloop"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6bdfa2c8ca8..c5f8b2f32de 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9122,6 +9122,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate CoreFoundation CoreGraphics CoreVideo; }; + threadloop = callPackage ../development/python-modules/threadloop { }; + threadpool = callPackage ../development/python-modules/threadpool { }; threadpoolctl = callPackage ../development/python-modules/threadpoolctl { }; From 0f37973306a31e377515ba1257008c15e2d7834f Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 2 Sep 2021 15:22:59 -0300 Subject: [PATCH 3/4] python3Packages.zc_buildout: 2.13.4 -> 3.0.0b2 --- .../python-modules/buildout/default.nix | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix index 796eaa18259..0b20eea257f 100644 --- a/pkgs/development/python-modules/buildout/default.nix +++ b/pkgs/development/python-modules/buildout/default.nix @@ -1,18 +1,37 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ buildPythonPackage +, fetchFromGitHub +, lib +, pip +, setuptools +, wheel +}: buildPythonPackage rec { - pname = "zc.buildout"; - version = "2.13.4"; + pname = "zc_buildout"; + version = "3.0.0b2"; - src = fetchPypi { - inherit pname version; - sha256 = "b978b2f9317b317ee4191f78fcc4f05b1ac41bdaaae47f0956f14c8285feef63"; + src = fetchFromGitHub { + owner = "buildout"; + repo = "buildout"; + rev = version; + sha256 = "01sj09xx5kmkzynhq1xd8ahn6xqybfi8lrqjqr5lr45aaxjk2pid"; }; + propagatedBuildInputs = [ + setuptools + pip + wheel + ]; + + doCheck = false; # Missing package & BLOCKED on "zc.recipe.egg" + + pythonImportsCheck = [ "zc.buildout" ]; + meta = with lib; { - homepage = "http://www.buildout.org"; description = "A software build and configuration system"; + downloadPage = "https://github.com/buildout/buildout"; + homepage = "https://www.buildout.org"; license = licenses.zpl21; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ superherointj ]; }; } From f92139a5dab1a5c4df4b3b700cb089df1cfc2f35 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 22 Oct 2021 10:30:55 -0300 Subject: [PATCH 4/4] python3Packages.zc_buildout: renamed to zc-buildout --- pkgs/development/python-modules/buildout/default.nix | 2 +- pkgs/development/python-modules/z3c-checkversions/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix index 0b20eea257f..3cf2c1712fb 100644 --- a/pkgs/development/python-modules/buildout/default.nix +++ b/pkgs/development/python-modules/buildout/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { - pname = "zc_buildout"; + pname = "zc-buildout"; version = "3.0.0b2"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix index 8610306ea6f..b8c684295a6 100644 --- a/pkgs/development/python-modules/z3c-checkversions/default.nix +++ b/pkgs/development/python-modules/z3c-checkversions/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , python -, zc_buildout +, zc-buildout , zope_testrunner }: @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "b45bd22ae01ed60933694fb5abede1ff71fe8ffa79b37082b2fcf38a2f0dec9d"; }; - propagatedBuildInputs = [ zc_buildout ]; + propagatedBuildInputs = [ zc-buildout ]; checkInputs = [ zope_testrunner ]; doCheck = !python.pkgs.isPy27; checkPhase = '' diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 9e24ea29e7f..bd3e315f086 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -84,5 +84,5 @@ mapAliases ({ tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05 WazeRouteCalculator = wazeroutecalculator; # 2021-09-29 websocket_client = websocket-client; - zc_buildout221 = zc_buildout; # added 2021-07-21 + zc-buildout221 = zc-buildout; # added 2021-07-21 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c5f8b2f32de..ccffb1fe5da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10011,7 +10011,7 @@ in { zarr = callPackage ../development/python-modules/zarr { }; - zc_buildout = callPackage ../development/python-modules/buildout { }; + zc-buildout = callPackage ../development/python-modules/buildout { }; zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { };