From 0372567397c24eb0b7df44b71cfb96e43bb8bd4a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 22 Aug 2019 14:28:34 -0700 Subject: [PATCH 1/2] python2Packages.wsproto: freeze at 0.14.1 --- .../python-modules/wsproto/0.14.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 +++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/wsproto/0.14.nix 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 00000000000..36aaf0ec8ce --- /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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index becb247410c..dbcdf5290eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6073,7 +6073,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 { }; From 3aa473687b65b19f32009b750964beaced492566 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 22 Aug 2019 14:31:54 -0700 Subject: [PATCH 2/2] python3Packages.wsproto: 0.14.1 -> 0.15.0 --- pkgs/development/python-modules/wsproto/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index 36aaf0ec8ce..dfbf9ceabdc 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 ];