Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2020-11-05 09:42:47 +01:00
106 changed files with 1203 additions and 794 deletions
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "bitarray";
version = "1.5.3";
version = "1.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "567631fc922b1c2c528c376795f18dcc0604d18702e0b8b50e8e35f0474214a5";
sha256 = "ba157ddebddc723fe021fc80595b3c70924d69ee58286b62bfca21da48edfc9d";
};
meta = with lib; {
@@ -1,13 +1,13 @@
{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }:
buildPythonPackage rec {
version = "4.22.1";
version = "4.23.0";
pname = "breathe";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "6e4b66e61876dac90e78b335788a38eaa3625ed9c70d0add261f98ddd128d36a";
sha256 = "c28e251ad8a42e4d3dd6c0861a66128b400131614b36f19df505ea34c934f801";
};
propagatedBuildInputs = [ docutils six sphinx ];
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "btchip-python";
version = "0.1.30";
version = "0.1.31";
src = fetchPypi {
inherit pname version;
sha256 = "1mraf2lmh70b038k934adxi7d40431j7yq93my3aws99f5xccsb8";
sha256 = "4167f3c6ea832dd189d447d0d7a8c2a968027671ae6f43c680192f2b72c39b2c";
};
propagatedBuildInputs = [ hidapi pyscard ecdsa ];
@@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "caldav";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "python-caldav";
repo = pname;
rev = "v${version}";
sha256 = "0m64maiqp3k8fsgkkvdx1dlfhkc70pqig4dclq6w8ajz82czrq83";
sha256 = "1shfj67kq6qzd0ngyfk09hpzfggybcfxv5s7hqs87nq9l51bssv8";
};
nativeBuildInputs = lib.optionals (pythonOlder "3.5") [ mock ];
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cbor2";
version = "5.1.2";
version = "5.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "91759bd0ee5ef0d4fa24144dfa551670730baeca8cf2fff1cc59f734ecd21de6";
sha256 = "a33aa2e5534fd74401ac95686886e655e3b2ce6383b3f958199b6e70a87c94bf";
};
nativeBuildInputs = [ setuptools_scm ];
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "cssselect2";
version = "0.3.0";
version = "0.4.1";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "5c2716f06b5de93f701d5755a9666f2ee22cbcd8b4da8adddfc30095ffea3abc";
sha256 = "93fbb9af860e95dd40bf18c3b2b6ed99189a07c0f29ba76f9c5be71344664ec8";
};
propagatedBuildInputs = [ tinycss2 ];
@@ -6,11 +6,12 @@
buildPythonPackage rec {
pname = "cupy";
version = "7.7.0";
version = "8.1.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "b4032adf839f63bab7fc9f3e7066ef86abe0928e834aa5d132e4e7ce907951ed";
sha256 = "4dfa4a0cd0a752d980347c816cab2169f0938c1d37275311810396dcf3c27912";
};
checkInputs = [
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "django-modelcluster";
version = "5.0.2";
version = "5.1";
src = fetchPypi {
inherit pname version;
sha256 = "c7a42cf9b93d1161a10bf59919f7ee52d996a523a4134b2a136f6fe1eba7a2fa";
sha256 = "783d177f7bf5c8f30fe365c347b9a032920de371fe1c63d955d7b283684d4c08";
};
disabled = pythonOlder "3.5";
@@ -1,7 +1,7 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy27 }:
buildPythonPackage rec {
version = "2.0.3";
version = "2.0.4";
pname = "elementpath";
disabled = isPy27; # uses incompatible class syntax
@@ -9,7 +9,7 @@ buildPythonPackage rec {
owner = "sissaschool";
repo = "elementpath";
rev = "v${version}";
sha256 = "16gs5glnlr4i41xbmd30x62zj85apmf69m9akvfnka0gkjlzv8in";
sha256 = "0812il5xn7cq0qa0vmkszrvprakfpyxmilk7s918l9kavdy4al8x";
};
# avoid circular dependency with xmlschema which directly depends on this
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "ExifRead";
version = "2.3.1";
version = "2.3.2";
src = fetchPypi {
inherit pname version;
sha256 = "269ff3a8eab8e082734a076182cce6fb126116619c0b7c2009bea34502cca213";
sha256 = "a0f74af5040168d3883bbc980efe26d06c89f026dc86ba28eb34107662d51766";
};
meta = with stdenv.lib; {
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "jq";
version = "1.0.2";
version = "1.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "9fe6ce07bc8d209c385d8ba132a2971c69aef015103c46bea87a73a16c5ec147";
sha256 = "62d649c4f6f26ed91810c8db075f5fe05319c3dc99dbebcd2d31b0b697a4592e";
};
patches = [ ./jq-py-setup.patch ];
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "pex";
version = "2.1.15";
version = "2.1.20";
src = fetchPypi {
inherit pname version;
sha256 = "e1092ae52cfdef41c22d98fa98f9225ac21936a7d096131777ca3a7940fe1b2d";
sha256 = "2f1cf9721aa5fce93b034d2a18922d34d6f5fb81236ab3a955706226b15658fd";
};
nativeBuildInputs = [ setuptools ];
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "pushbullet.py";
version = "0.11.0";
version = "0.12.0";
src = fetchPypi {
inherit pname version;
sha256 = "aa9dc7bb46e083e3497d46241154f12944a8f540e29d150330ca94db0b453b8d";
sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64";
};
propagatedBuildInputs = [ requests websocket_client python_magic ];
@@ -1,29 +1,54 @@
{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, requests
, requests-mock, pytest
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, poetry
, aiohttp
, numpy
, pysmb
, aresponses
, asynctest
, pytest-aiohttp
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pyairvisual";
version = "1.0.0";
version = "5.0.4";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = "v${version}";
sha256 = "0ng6k07n91k5l68zk3hl4fywb33admp84wqdm20qmmw9yc9c64fd";
rev = version;
sha256 = "0z769xrb6w6bhqcq02sjryl1qyvk9dc1xfn06fc3mdqnrbr0xxj3";
};
checkInputs = [ pytest requests-mock ];
propagatedBuildInputs = [ requests ];
nativeBuildInputs = [ poetry ];
checkPhase = ''
py.test tests
'';
propagatedBuildInputs = [
aiohttp
numpy
pysmb
];
disabled = !isPy3k;
checkInputs = [
aresponses
asynctest
pytest-aiohttp
pytest-asyncio
pytestCheckHook
];
pytestFlagsArray = [
"tests"
];
meta = with lib; {
description = "A thin Python wrapper for the AirVisual API";
description = "A simple, clean, well-tested Python library for interacting with AirVisual©";
license = licenses.mit;
homepage = "https://github.com/bachya/pyairvisual";
};
@@ -12,17 +12,26 @@
buildPythonPackage rec {
pname = "pyatmo";
version = "4.1.0";
disabled = pythonOlder "3.5"; # uses type hints
version = "4.2.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jabesq";
repo = "netatmo-api-python";
rev = "v${version}";
sha256 = "0x3xq6ni9rl5k3vi0ydqafdzvza785ycnlgyikgqbkppbh3j33ig";
sha256 = "0b2k1814zg3994k60xdw5gpsl8k1wy9zndd0b1p4dfb5qkx9f8kp";
};
propagatedBuildInputs = [ oauthlib requests requests_oauthlib ];
postPatch = ''
substituteInPlace setup.cfg \
--replace "oauthlib==3.1.0" "oauthlib"
'';
propagatedBuildInputs = [
oauthlib
requests
requests_oauthlib
];
checkInputs = [
freezegun
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "python-sql";
version = "1.1.0";
version = "1.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "0f0g10y0whvax8yv0rfs7b4yd68lbxbss1za0mvbvr65b8r3pdxz";
sha256 = "306999bd311fbf50804d76f346655af0a6ff18881ce46c1329256fee40f492c0";
};
meta = {
@@ -1,40 +0,0 @@
{ stdenv
, fetchFromGitHub
, docopt
, requests
, smugpy
, python
, pkgs
}:
stdenv.mkDerivation rec {
pname = "smugline";
version = "20160106";
src = fetchFromGitHub {
owner = "gingerlime";
repo = pname;
rev = "134554c574c2d282112ba60165a8c5ffe0f16fd4";
sha256 = "00n012ijkdrx8wsl8x3ghdcxcdp29s4kwr3yxvlyj79g5yhfvaj6";
};
phases = [ "unpackPhase" "installPhase" ];
buildInputs = [ python pkgs.makeWrapper ];
propagatedBuildInputs = [ docopt requests smugpy ];
installPhase = ''
mkdir -p $out/bin $out/libexec
cp smugline.py $out/libexec
makeWrapper ${python.interpreter} $out/bin/smugline \
--add-flags "$out/libexec/smugline.py" \
--prefix PYTHONPATH : "$PYTHONPATH"
'';
meta = with stdenv.lib; {
homepage = "https://github.com/gingerlime/smugline";
description = "A simple command line tool for smugmug ";
license = licenses.mit;
};
}
@@ -1,21 +0,0 @@
{ stdenv, buildPythonPackage, fetchFromGitHub }:
buildPythonPackage rec {
pname = "smugpy";
version = "20131218";
src = fetchFromGitHub {
owner = "chrishoffman";
repo = pname;
rev = "f698d6749ce446e3d6c7d925b2cd1cd5b3d695ea";
sha256 = "029x6hm1744iznv4sw8sfyl974wmx1sqnr1k5dvzzwpk3ja49a1y";
};
meta = with stdenv.lib; {
description = "Python library for the SmugMug API";
license = with licenses; [ mit ];
homepage = "https://github.com/chrishoffman/smugpy";
};
doCheck = false; # Tries to login to Smugmug…
}