irrd: 4.4.4 -> 4.5.0b1, fix build

We can no longer reasonabley use sqlalchemy 1.3, so update to the beta which has sqlalchemy 1.4

Diff: https://github.com/irrdnet/irrd/compare/v4.4.4...v4.5.0b1
Release notes: https://irrd.readthedocs.io/en/latest/releases/4.5.0/

authored by Yureka and committed by GitHub 5a3ef150 fc8835d4

+13 -38
+13 -38
pkgs/by-name/ir/irrd/package.nix
··· 15 15 py = python3.override { 16 16 self = py; 17 17 packageOverrides = final: prev: { 18 - # sqlalchemy 1.4.x or 2.x are not supported 19 - sqlalchemy = prev.sqlalchemy_1_4.overridePythonAttrs (oldAttrs: rec { 20 - version = "1.3.24"; 21 - src = fetchPypi { 22 - pname = "SQLAlchemy"; 23 - inherit version; 24 - hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk="; 25 - }; 26 - postPatch = '' 27 - sed -i '/tag_build = dev/d' setup.cfg 28 - ''; 29 - doCheck = false; 30 - }); 31 - alembic = prev.alembic.overridePythonAttrs ( 32 - lib.const { 33 - doCheck = false; 34 - } 35 - ); 18 + # sqlalchemy 2.0 is not supported 19 + sqlalchemy = prev.sqlalchemy_1_4; 20 + 21 + # checkInputs do not work wiht sqlalchemy < 2.0 36 22 factory-boy = prev.factory-boy.overridePythonAttrs ( 37 23 lib.const { 38 24 doCheck = false; 39 25 } 40 26 ); 27 + 28 + # https://github.com/irrdnet/irrd/blob/22fe77e46ef1b4e43e346257795e171e7ee70d44/pyproject.toml#L30 41 29 beautifultable = prev.beautifultable.overridePythonAttrs (oldAttrs: rec { 42 30 version = "0.8.0"; 43 31 src = fetchPypi { ··· 53 41 54 42 py.pkgs.buildPythonPackage rec { 55 43 pname = "irrd"; 56 - version = "4.4.4"; 44 + version = "4.5.0b1"; 57 45 format = "pyproject"; 58 46 59 47 src = fetchFromGitHub { 60 48 owner = "irrdnet"; 61 49 repo = "irrd"; 62 50 rev = "v${version}"; 63 - hash = "sha256-UIOKXU92JEOeVdpYLNmDBtLn0u3LMdKItcn9bFd9u8g="; 51 + hash = "sha256-Hr/PbC4N/yrYeQ7bTfqIchDFmaL3c4afxV1XS7FR1F8="; 64 52 }; 65 53 66 - patches = [ 67 - # starlette 0.37.2 reverted the behaviour change which this adjusted to 68 - (fetchpatch { 69 - url = "https://github.com/irrdnet/irrd/commit/43e26647e18f8ff3459bbf89ffbff329a0f1eed5.patch"; 70 - revert = true; 71 - hash = "sha256-G216rHfWMZIl9GuXBz6mjHCIm3zrfDDLSmHQK/HkkzQ="; 72 - }) 73 - # Backport build fix for webauthn 2.1 74 - (fetchpatch { 75 - url = "https://github.com/irrdnet/irrd/commit/20b771e1ee564f38e739fdb0a2a79c10319f638f.patch"; 76 - hash = "sha256-PtNdhSoFPT1kt71kFsySp/VnUpUdO23Gu9FKknHLph8="; 77 - includes = [ "irrd/webui/auth/endpoints_mfa.py" ]; 78 - }) 79 - ]; 80 - 81 54 postPatch = '' 82 55 substituteInPlace pyproject.toml \ 83 - --replace-fail psycopg2-binary psycopg2 56 + --replace-fail py-radix py-radix-sr 84 57 ''; 85 58 pythonRelaxDeps = true; 86 59 ··· 131 104 pydantic 132 105 typing-extensions 133 106 py-radix-sr 134 - psycopg2 107 + psycopg2-binary 135 108 sqlalchemy 136 109 alembic 137 110 ujson ··· 149 122 wtforms-bootstrap5 150 123 email-validator 151 124 jinja2 125 + joserfc 126 + time-machine 152 127 ] 153 128 ++ py.pkgs.uvicorn.optional-dependencies.standard; 154 129 155 130 preCheck = '' 156 131 export SMTPD_HOST=127.0.0.1 157 - export IRRD_DATABASE_URL="postgres:///$PGDATABASE" 132 + export IRRD_DATABASE_URL="postgresql:///$PGDATABASE" 158 133 export IRRD_REDIS_URL="redis://localhost/1" 159 134 ''; 160 135