Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main

1 files changed, 30 insertions, 12 deletions

diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpcore/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpcore/default.nix
index 9ac9b76d2e36..aa15c2555e67 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpcore/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpcore/default.nix
@@ -1,34 +1,52 @@
-{ stdenv
+{ lib
 , buildPythonPackage
+, pythonOlder
 , fetchFromGitHub
-, isPy27
 , h11
+, h2
+, pproxy
+, pytestCheckHook
+, pytestcov
 , sniffio
+, uvicorn
 }:
 
 buildPythonPackage rec {
   pname = "httpcore";
-  version = "0.10.2";
-  disabled = isPy27;
+  version = "0.12.0";
+  disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "encode";
     repo = pname;
     rev = version;
-    sha256 = "00gn8nfv814rg6fj7xv97mrra3fvx6fzjcgx9y051ihm6hxljdsi";
+    sha256 = "0bwxn7m7r7h6k41swxj0jqj3nzi76wqxwbnry6y7d4qfh4m26g2j";
   };
 
-  propagatedBuildInputs = [ h11 sniffio ];
+  propagatedBuildInputs = [
+    h11
+    h2
+    sniffio
+  ];
+
+  checkInputs = [
+    pproxy
+    pytestCheckHook
+    pytestcov
+    uvicorn
+  ];
+
+  pytestFlagsArray = [
+    # these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known
+    "--ignore=tests/sync_tests/test_interfaces.py"
+  ];
 
-  # tests require pythonic access to mitmproxy, which isn't (yet?) packaged as
-  # a pythonPackage.
-  doCheck = false;
   pythonImportsCheck = [ "httpcore" ];
 
-  meta = with stdenv.lib; {
-    description = "A minimal HTTP client";
+  meta = with lib; {
+    description = "A minimal low-level HTTP client";
     homepage = "https://github.com/encode/httpcore";
     license = licenses.bsd3;
-    maintainers = [ maintainers.ris ];
+    maintainers = with maintainers; [ ris ];
   };
 }