Merge pull request #209900 from dotlambda/python311-fixes

authored by

Martin Weinelt and committed by
GitHub
c3115ee2 e3c70611

+20 -17
+3 -10
pkgs/development/python-modules/anyio/default.nix
··· 21 22 buildPythonPackage rec { 23 pname = "anyio"; 24 - version = "3.5.0"; 25 format = "pyproject"; 26 disabled = pythonOlder "3.7"; 27 ··· 29 owner = "agronholm"; 30 repo = pname; 31 rev = version; 32 - sha256 = "sha256-AZ9M/NBCBlMIUpRJgKbJRL/oReZDUh2Jhwtoxoo0tMs="; 33 }; 34 - 35 - patches = [ 36 - (fetchpatch { 37 - # Pytest 7.0 compatibility 38 - url = "https://github.com/agronholm/anyio/commit/fed7cc4f95e196f68251bcb9253da3b143ea8e7e.patch"; 39 - sha256 = "sha256-VmZmiQEmWJ4aPz0Wx+GTMZo7jXRDScnRYf2Hu2hiRVw="; 40 - }) 41 - ]; 42 43 preBuild = '' 44 export SETUPTOOLS_SCM_PRETEND_VERSION=${version} ··· 95 pythonImportsCheck = [ "anyio" ]; 96 97 meta = with lib; { 98 description = "High level compatibility layer for multiple asynchronous event loop implementations on Python"; 99 homepage = "https://github.com/agronholm/anyio"; 100 license = licenses.mit;
··· 21 22 buildPythonPackage rec { 23 pname = "anyio"; 24 + version = "3.6.2"; 25 format = "pyproject"; 26 disabled = pythonOlder "3.7"; 27 ··· 29 owner = "agronholm"; 30 repo = pname; 31 rev = version; 32 + hash = "sha256-bootaulvx9zmobQGDirsMz5uxuLeCD9ggAvYkPaKnWo="; 33 }; 34 35 preBuild = '' 36 export SETUPTOOLS_SCM_PRETEND_VERSION=${version} ··· 87 pythonImportsCheck = [ "anyio" ]; 88 89 meta = with lib; { 90 + changelog = "https://github.com/agronholm/anyio/blob/${src.rev}/docs/versionhistory.rst"; 91 description = "High level compatibility layer for multiple asynchronous event loop implementations on Python"; 92 homepage = "https://github.com/agronholm/anyio"; 93 license = licenses.mit;
+5
pkgs/development/python-modules/http-parser/default.nix
··· 19 }; 20 21 nativeBuildInputs = [ 22 setuptools 23 ]; 24 25 26 pythonImportsCheck = [ 27 "http_parser"
··· 19 }; 20 21 nativeBuildInputs = [ 22 + cython 23 setuptools 24 ]; 25 26 + preBuild = '' 27 + # re-run cython 28 + make -B 29 + ''; 30 31 pythonImportsCheck = [ 32 "http_parser"
+1 -1
pkgs/development/python-modules/pydantic/default.nix
··· 54 cython 55 ] ++ lib.optionals withDocs [ 56 # dependencies for building documentation 57 ansi2html 58 markdown-include 59 mdx-truly-sane-lists ··· 67 ]; 68 69 propagatedBuildInputs = [ 70 - autoflake 71 devtools 72 email-validator 73 pyupgrade
··· 54 cython 55 ] ++ lib.optionals withDocs [ 56 # dependencies for building documentation 57 + autoflake 58 ansi2html 59 markdown-include 60 mdx-truly-sane-lists ··· 68 ]; 69 70 propagatedBuildInputs = [ 71 devtools 72 email-validator 73 pyupgrade
+8 -5
pkgs/development/tools/analysis/autoflake/default.nix pkgs/development/python-modules/autoflake/default.nix
··· 1 { lib 2 - , python3 3 }: 4 5 - python3.pkgs.buildPythonApplication rec { 6 pname = "autoflake"; 7 version = "1.4"; 8 9 - src = python3.pkgs.fetchPypi { 10 inherit pname version; 11 hash = "sha256-YaNTASz/arlMoGKCPR+y9pLErNpRx2/4Oo13kV+6Ueo="; 12 }; 13 14 - propagatedBuildInputs = with python3.pkgs; [ 15 pyflakes 16 ]; 17 18 - checkInputs = with python3.pkgs; [ 19 pytestCheckHook 20 ]; 21
··· 1 { lib 2 + , buildPythonPackage 3 + , fetchPypi 4 + , pyflakes 5 + , pytestCheckHook 6 }: 7 8 + buildPythonPackage rec { 9 pname = "autoflake"; 10 version = "1.4"; 11 12 + src = fetchPypi { 13 inherit pname version; 14 hash = "sha256-YaNTASz/arlMoGKCPR+y9pLErNpRx2/4Oo13kV+6Ueo="; 15 }; 16 17 + propagatedBuildInputs = [ 18 pyflakes 19 ]; 20 21 + checkInputs = [ 22 pytestCheckHook 23 ]; 24
+1 -1
pkgs/top-level/all-packages.nix
··· 2644 2645 authenticator = callPackage ../applications/misc/authenticator { }; 2646 2647 - autoflake = callPackage ../development/tools/analysis/autoflake { }; 2648 2649 autospotting = callPackage ../applications/misc/autospotting { }; 2650
··· 2644 2645 authenticator = callPackage ../applications/misc/authenticator { }; 2646 2647 + autoflake = with python3.pkgs; toPythonApplication autoflake; 2648 2649 autospotting = callPackage ../applications/misc/autospotting { }; 2650
+2
pkgs/top-level/python-packages.nix
··· 780 781 autofaiss = callPackage ../development/python-modules/autofaiss { }; 782 783 autograd = callPackage ../development/python-modules/autograd { }; 784 785 autoit-ripper = callPackage ../development/python-modules/autoit-ripper { };
··· 780 781 autofaiss = callPackage ../development/python-modules/autofaiss { }; 782 783 + autoflake = callPackage ../development/python-modules/autoflake { }; 784 + 785 autograd = callPackage ../development/python-modules/autograd { }; 786 787 autoit-ripper = callPackage ../development/python-modules/autoit-ripper { };