From 9b092e228b2d9eab54c49685cddd6e30fde8eceb Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 16 Sep 2019 13:24:14 -0700
Subject: [PATCH 1/3] python3Packages.websockets: 7.0 -> 8.0.2
---
.../python-modules/websockets/default.nix | 20 ++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix
index 2e0caae4b46..589a8089fca 100644
--- a/pkgs/development/python-modules/websockets/default.nix
+++ b/pkgs/development/python-modules/websockets/default.nix
@@ -1,24 +1,26 @@
{ lib
-, fetchPypi
+, fetchFromGitHub
, buildPythonPackage
, pythonOlder
+, pytest
}:
buildPythonPackage rec {
pname = "websockets";
- version = "7.0";
+ version = "8.0.2";
- src = fetchPypi {
- inherit pname version;
- sha256 = "17vwr6sa1y3lb24wzfyyc98c5v03di4j8f24qkqa9vsvaghc7qq8";
+ src = fetchFromGitHub {
+ owner = "aaugustin";
+ repo = pname;
+ rev = version;
+ sha256 = "02fgb8gib4z5fqv30brz3mhxmblw9bw0978fhpjdrkj7wvqrz5h8";
};
disabled = pythonOlder "3.3";
- doCheck = false; # protocol tests fail
- meta = {
+ meta = with lib; {
description = "WebSocket implementation in Python 3";
- homepage = https://github.com/aaugustin/websockets;
- license = lib.licenses.bsd3;
+ homepage = "https://github.com/aaugustin/websockets";
+ license = licenses.bsd3;
};
}
From 80d1a3b37cdb621417f6be6783af48285d48b5d1 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 16 Sep 2019 15:07:28 -0700
Subject: [PATCH 2/3] python3Packages.uvicorn: 0.8.4 -> 0.9.0
---
.../python-modules/uvicorn/default.nix | 24 ++++++++++++-------
.../python-modules/uvicorn/setup.patch | 13 ----------
2 files changed, 16 insertions(+), 21 deletions(-)
delete mode 100644 pkgs/development/python-modules/uvicorn/setup.patch
diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix
index 1bf0d1c54f0..9f7efef1e84 100644
--- a/pkgs/development/python-modules/uvicorn/default.nix
+++ b/pkgs/development/python-modules/uvicorn/default.nix
@@ -1,23 +1,27 @@
{ lib
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
, click
, h11
, httptools
, uvloop
, websockets
, wsproto
+, pytest
+, requests
, isPy27
}:
buildPythonPackage rec {
pname = "uvicorn";
- version = "0.8.4";
+ version = "0.9.0";
disabled = isPy27;
- src = fetchPypi {
- inherit pname version;
- sha256 = "1l8rfm30inx9pma893i7sby9h7y910k58841zqaajksn563b882k";
+ src = fetchFromGitHub {
+ owner = "encode";
+ repo = pname;
+ rev = version;
+ sha256 = "0z4h04mbkzqgpk698bac6f50jxkf02ils6khzl7zbw7yvi6gkkc8";
};
propagatedBuildInputs = [
@@ -29,11 +33,15 @@ buildPythonPackage rec {
wsproto
];
- checkPhase = ''
- $out/bin/uvicorn --help
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "h11==0.8.*" "h11"
'';
- patches = [ ./setup.patch ];
+ checkInputs = [ pytest requests ];
+ checkPhase = ''
+ pytest
+ '';
meta = with lib; {
homepage = https://www.uvicorn.org/;
diff --git a/pkgs/development/python-modules/uvicorn/setup.patch b/pkgs/development/python-modules/uvicorn/setup.patch
deleted file mode 100644
index f1d974b42d9..00000000000
--- a/pkgs/development/python-modules/uvicorn/setup.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 802cda4..561abf4 100755
---- a/setup.py
-+++ b/setup.py
-@@ -42,7 +42,7 @@ env_marker = (
-
- requirements = [
- "click==7.*",
-- "h11==0.8.*",
-+ "h11",
- "websockets==7.*",
- "httptools==0.0.13 ;" + env_marker,
- "uvloop==0.12.* ;" + env_marker,
From 2d8a5baa9ca5feeccf4472995f22b8af62b533d0 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 16 Sep 2019 13:29:34 -0700
Subject: [PATCH 3/3] python3Packages.python-engineio: 3.4.3 -> 3.9.3
---
.../python-engineio/default.nix | 26 +++++++++----------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix
index 93dd9fb654f..bf6d4cd2381 100644
--- a/pkgs/development/python-modules/python-engineio/default.nix
+++ b/pkgs/development/python-modules/python-engineio/default.nix
@@ -1,27 +1,25 @@
-{ stdenv
-, buildPythonPackage
-, fetchFromGitHub
-, six
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, aiohttp
, eventlet
-, mock
, iana-etc
, libredirect
-, aiohttp
-, websockets
-, websocket_client
+, mock
, requests
+, six
, tornado
+, websocket_client
+, websockets
}:
buildPythonPackage rec {
pname = "python-engineio";
- version = "3.4.3";
+ version = "3.9.3";
src = fetchFromGitHub {
owner = "miguelgrinberg";
repo = "python-engineio";
rev = "v${version}";
- sha256 = "0wk81rqigw47z087f5kc7b9iwqggypxc62q8q818qyzqwb93ysxf";
+ sha256 = "0rwlj12d37dpw6y3bdn6rxv68xnd9ykj4fr3ly0fa143xci35d9y";
};
propagatedBuildInputs = [
@@ -29,13 +27,13 @@ buildPythonPackage rec {
];
checkInputs = [
+ aiohttp
eventlet
mock
- aiohttp
- websockets
- websocket_client
- tornado
requests
+ tornado
+ websocket_client
+ websockets
];
# make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox