diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-25 19:39:41 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-25 19:39:41 +0200 |
| commit | 665d3939192e8c44207dcb1ee95f25addd4c3d38 (patch) | |
| tree | e0f42905fbb0e28d963a4a23d01b88a3fba3701f /pkgs/development/python-modules | |
| parent | 656e14f64fa48222907dd631d68c600f18f126d7 (diff) | |
| parent | 58c0d63100244211f5a898d5c26a76aca038698c (diff) | |
| download | nixlib-665d3939192e8c44207dcb1ee95f25addd4c3d38.tar nixlib-665d3939192e8c44207dcb1ee95f25addd4c3d38.tar.gz nixlib-665d3939192e8c44207dcb1ee95f25addd4c3d38.tar.bz2 nixlib-665d3939192e8c44207dcb1ee95f25addd4c3d38.tar.lz nixlib-665d3939192e8c44207dcb1ee95f25addd4c3d38.tar.xz nixlib-665d3939192e8c44207dcb1ee95f25addd4c3d38.tar.zst nixlib-665d3939192e8c44207dcb1ee95f25addd4c3d38.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/linode-api/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/matrix-client/default.nix | 32 |
2 files changed, 34 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index a89596828f6a..45c33f94b28a 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "linode-api"; - version = "4.1.1b2"; # NOTE: this is a beta, and the API may change in future versions. + version = "4.1.2b0"; # NOTE: this is a beta, and the API may change in future versions. name = "${pname}-${version}"; disabled = (pythonOlder "2.7"); @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1lfqsll3wv1wzn98ymmcbw0yawj8ab3mxniws6kaxf99jd4a0xp4"; + sha256 = "19yzyb4sbxib8yxmrqm6d8i0fm8cims56q7kiq2ana26nbcm0gr4"; }; meta = { diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix new file mode 100644 index 000000000000..20af252f58f6 --- /dev/null +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, requests +, tox, pytest, flake8, responses +}: + +buildPythonPackage rec { + pname = "matrix-client"; + version = "0.0.6"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "15kx5px26hwr0sxpyjk4w61fjnabg1b57hwys1nyarc0jx4qjhiq"; + }; + + checkInputs = [ tox pytest flake8 responses ]; + + propagatedBuildInputs = [ requests ]; + + checkPhase = '' + pytest + ''; + + meta = with stdenv.lib; { + description = "Matrix Client-Server SDK"; + homepage = https://github.com/matrix-org/matrix-python-sdk; + license = licenses.asl20; + maintainers = with maintainers; [ olejorgenb ]; + }; +} |