diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
| commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
| tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/development/python-modules/httpx/default.nix | |
| parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
| parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
| download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/httpx/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/httpx/default.nix | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/httpx/default.nix b/nixpkgs/pkgs/development/python-modules/httpx/default.nix index 7e451532af04..0bbb64652737 100644 --- a/nixpkgs/pkgs/development/python-modules/httpx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httpx/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, anyio , brotli , brotlicffi , buildPythonPackage @@ -11,12 +12,12 @@ , hatch-fancy-pypi-readme , hatchling , httpcore +, idna , isPyPy , multipart , pygments , python , pythonOlder -, rfc3986 , rich , sniffio , socksio @@ -29,7 +30,7 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.25.0"; + version = "0.25.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -38,7 +39,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-zQVavjU66ksO0FB1h32e0YUhOGiQ4jHPvjgLhtxjU6s="; + hash = "sha256-rGtIrs4dffs7Ndtjb400q7JrZh+HG9k0uwHw9pRlC5s="; }; nativeBuildInputs = [ @@ -47,9 +48,10 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + anyio certifi httpcore - rfc3986 + idna sniffio ]; @@ -83,14 +85,7 @@ buildPythonPackage rec { pytest-trio trustme uvicorn - ] ++ passthru.optional-dependencies.http2 - ++ passthru.optional-dependencies.brotli - ++ passthru.optional-dependencies.socks; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "rfc3986[idna2008]>=1.3,<2" "rfc3986>=1.3" - ''; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); # testsuite wants to find installed packages for testing entrypoint preCheck = '' |