From 050733abb0e3d2cfa0e9b0db70b91cad64440f1c Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Thu, 21 Jul 2016 14:45:35 -0400 Subject: [PATCH] backblaze-b2: 0.4.4 -> 0.6.2 --- .../tools/backblaze-b2/default.nix | 8 +++--- pkgs/top-level/python-packages.nix | 27 +++++++++++++++++-- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 0ba346ec110..045272e19d3 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -2,16 +2,16 @@ pythonPackages.buildPythonApplication rec { name = "backblaze-b2-${version}"; - version = "0.4.4"; + version = "0.6.2"; src = fetchFromGitHub { owner = "Backblaze"; repo = "B2_Command_Line_Tool"; - rev = "74a5e567925899f1fc6204aa85d4c84c0d0e511a"; - sha256 = "1g9j5s69w6n70nb18rvx3gm9f4gi1vis23ib8rn2v1khv6z2acqp"; + rev = "3a4cd3f0b5309f79f98c2e0d51afc19fb2fe4201"; + sha256 = "1gl1z7zg3s1xgx45i6b1bvx9iwviiiinl4my00h66qkhrw7ag8p1"; }; - propagatedBuildInputs = with pythonPackages; [ six ]; + propagatedBuildInputs = with pythonPackages; [ futures requests2 six tqdm4 ]; checkPhase = '' python test_b2_command_line.py test diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e0405b63f9f..4c7d8fd2dbd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10477,11 +10477,11 @@ in modules // { futures = buildPythonPackage rec { name = "futures-${version}"; - version = "3.0.4"; + version = "3.0.5"; src = pkgs.fetchurl { url = "mirror://pypi/f/futures/${name}.tar.gz"; - sha256 = "19485d83f7bd2151c0aeaf88fbba3ee50dadfb222ffc3b66a344ef4952b782a3"; + sha256 = "1pw1z4329xvlabdpwqa6b7v2fxf7hl64m4cgr22ckbym8m8m4hh5"; }; # This module is for backporting functionality to Python 2.x, it's builtin in py3k @@ -23192,6 +23192,29 @@ in modules // { }; }; + tqdm4 = buildPythonPackage rec { + name = "tqdm-${version}"; + version = "4.7.6"; + + src = pkgs.fetchurl { + url = "mirror://pypi/t/tqdm/${name}.tar.gz"; + sha256 = "1z801zl1y3cf6ixzw4jlpkbp9a9j92sqzs35l0jaqfq00aj1bdm0"; + }; + + buildInputs = with self; [ nose coverage pkgs.glibcLocales flake8 ]; + propagatedBuildInputs = with self; [ matplotlib pandas ]; + + LC_ALL="en_US.UTF-8"; + + doCheck = false; # Many transient failures in performance tests and due to use of sleep + + meta = { + description = "A Fast, Extensible Progress Meter"; + homepage = https://github.com/tqdm/tqdm; + license = with licenses; [ mit ]; + }; + }; + smmap = buildPythonPackage rec { name = "smmap-0.9.0"; disabled = isPyPy; # This fails the tests if built with pypy