From a34f3fe11037527db48a51dc29a2cb7dca0793f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Jan 2024 11:01:53 +0100 Subject: [PATCH 1/2] python311Packages.gql: 3.4.1 -> 3.6.0b0 Diff: graphql-python/gql@refs/tags/v3.4.1...v3.6.0b0 Changelog: https://github.com/graphql-python/gql/releases/tag/v3.6.0b0 --- .../python-modules/gql/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix index 9827f8d5a71a..29ea044c328e 100644 --- a/pkgs/development/python-modules/gql/default.nix +++ b/pkgs/development/python-modules/gql/default.nix @@ -1,11 +1,13 @@ { lib , aiofiles , aiohttp +, anyio , backoff , botocore , buildPythonPackage , fetchFromGitHub , graphql-core +, httpx , mock , parse , pytest-asyncio @@ -14,6 +16,7 @@ , pythonOlder , requests , requests-toolbelt +, setuptools , urllib3 , vcrpy , websockets @@ -22,25 +25,24 @@ buildPythonPackage rec { pname = "gql"; - version = "3.4.1"; - format = "setuptools"; + version = "3.6.0b0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "graphql-python"; - repo = pname; + repo = "gql"; rev = "refs/tags/v${version}"; - hash = "sha256-/uPaRju2AJCjMCfA29IKQ4Hu71RBu/Yz8jHwk9EE1Eg="; + hash = "sha256-yX6NbtGxBa3lL/bS3j2ouTPku6a4obqNGx1xRzx+Skk="; }; - postPatch = '' - substituteInPlace setup.py --replace \ - "websockets>=10,<11;python_version>'3.6'" \ - "websockets>=10,<12;python_version>'3.6'" - ''; + nativeBuildInputs = [ + setuptools + ]; propagatedBuildInputs = [ + anyio backoff graphql-core yarl @@ -60,6 +62,7 @@ buildPythonPackage rec { all = [ aiohttp botocore + httpx requests requests-toolbelt urllib3 @@ -68,6 +71,9 @@ buildPythonPackage rec { aiohttp = [ aiohttp ]; + httpx = [ + httpx + ]; requests = [ requests requests-toolbelt From 7b96257a6795bf533129aa8bb5473866073cb4f0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Jan 2024 12:23:58 +0100 Subject: [PATCH 2/2] python311Packages.gql: enable darwin build --- pkgs/development/python-modules/gql/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix index 29ea044c328e..37fa70e28efe 100644 --- a/pkgs/development/python-modules/gql/default.nix +++ b/pkgs/development/python-modules/gql/default.nix @@ -37,6 +37,8 @@ buildPythonPackage rec { hash = "sha256-yX6NbtGxBa3lL/bS3j2ouTPku6a4obqNGx1xRzx+Skk="; }; + __darwinAllowLocalNetworking = true; + nativeBuildInputs = [ setuptools ];