diff options
author | Lancelot SIX <lsix+github@lancelotsix.com> | 2019-08-23 00:56:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-23 00:56:02 +0200 |
commit | 1e2497720f6a1b6b5749111ae6f4c990717ac2dd (patch) | |
tree | efbb76bfd2a87c03a1e373e79a0f117a71dde275 | |
parent | 1f3b789ebe954bdd59f5ec05761143c37cdfa179 (diff) | |
parent | 3aa473687b65b19f32009b750964beaced492566 (diff) | |
download | nixlib-1e2497720f6a1b6b5749111ae6f4c990717ac2dd.tar nixlib-1e2497720f6a1b6b5749111ae6f4c990717ac2dd.tar.gz nixlib-1e2497720f6a1b6b5749111ae6f4c990717ac2dd.tar.bz2 nixlib-1e2497720f6a1b6b5749111ae6f4c990717ac2dd.tar.lz nixlib-1e2497720f6a1b6b5749111ae6f4c990717ac2dd.tar.xz nixlib-1e2497720f6a1b6b5749111ae6f4c990717ac2dd.tar.zst nixlib-1e2497720f6a1b6b5749111ae6f4c990717ac2dd.zip |
Merge pull request #67303 from jonringer/bump-wsproto
python3Packages.wsproto: 0.14.1 -> 0.15.0
-rw-r--r-- | pkgs/development/python-modules/wsproto/0.14.nix | 25 | ||||
-rw-r--r-- | pkgs/development/python-modules/wsproto/default.nix | 13 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 5 |
3 files changed, 38 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/wsproto/0.14.nix b/pkgs/development/python-modules/wsproto/0.14.nix new file mode 100644 index 000000000000..36aaf0ec8ceb --- /dev/null +++ b/pkgs/development/python-modules/wsproto/0.14.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, h11, enum34, pytest }: + +buildPythonPackage rec { + pname = "wsproto"; + version = "0.14.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "051s127qb5dladxa14n9nqajwq7xki1dz1was5r5v9df5a0jq8pd"; + }; + + propagatedBuildInputs = [ h11 enum34 ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Pure Python, pure state-machine WebSocket implementation"; + homepage = https://github.com/python-hyper/wsproto/; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index 36aaf0ec8ceb..dfbf9ceabdc3 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -1,15 +1,20 @@ -{ lib, buildPythonPackage, fetchPypi, h11, enum34, pytest }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy36 +, dataclasses +, h11 +, pytest +}: buildPythonPackage rec { pname = "wsproto"; - version = "0.14.1"; + version = "0.15.0"; + disabled = pythonOlder "3.6"; # python versions <3.6 src = fetchPypi { inherit pname version; - sha256 = "051s127qb5dladxa14n9nqajwq7xki1dz1was5r5v9df5a0jq8pd"; + sha256 = "17gsxlli4w8am1wwwl3k90hpdfa213ax40ycbbvb7hjx1v1rhiv1"; }; - propagatedBuildInputs = [ h11 enum34 ]; + propagatedBuildInputs = [ h11 ] ++ lib.optional isPy36 dataclasses; checkInputs = [ pytest ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d60e7842079e..2067305b53e6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6077,7 +6077,10 @@ in { us = callPackage ../development/python-modules/us { }; - wsproto = callPackage ../development/python-modules/wsproto { }; + wsproto = if (pythonAtLeast "3.6") then + callPackage ../development/python-modules/wsproto { } + else + callPackage ../development/python-modules/wsproto/0.14.nix { }; h11 = callPackage ../development/python-modules/h11 { }; |