From 5a3ef150d6512c4d926bfd4eddecd830e01b2698 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Wed, 25 Jun 2025 14:50:18 +0200
Subject: [PATCH] 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/
---
 pkgs/by-name/ir/irrd/package.nix | 51 ++++++++------------------------
 1 file changed, 13 insertions(+), 38 deletions(-)

diff --git a/pkgs/by-name/ir/irrd/package.nix b/pkgs/by-name/ir/irrd/package.nix
index 4db3072fd18e..44165dfa4518 100644
--- a/pkgs/by-name/ir/irrd/package.nix
+++ b/pkgs/by-name/ir/irrd/package.nix
@@ -15,29 +15,17 @@ let
   py = python3.override {
     self = py;
     packageOverrides = final: prev: {
-      # sqlalchemy 1.4.x or 2.x are not supported
-      sqlalchemy = prev.sqlalchemy_1_4.overridePythonAttrs (oldAttrs: rec {
-        version = "1.3.24";
-        src = fetchPypi {
-          pname = "SQLAlchemy";
-          inherit version;
-          hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk=";
-        };
-        postPatch = ''
-          sed -i '/tag_build = dev/d' setup.cfg
-        '';
-        doCheck = false;
-      });
-      alembic = prev.alembic.overridePythonAttrs (
-        lib.const {
-          doCheck = false;
-        }
-      );
+      # sqlalchemy 2.0 is not supported
+      sqlalchemy = prev.sqlalchemy_1_4;
+
+      # checkInputs do not work wiht sqlalchemy < 2.0
       factory-boy = prev.factory-boy.overridePythonAttrs (
         lib.const {
           doCheck = false;
         }
       );
+
+      # https://github.com/irrdnet/irrd/blob/22fe77e46ef1b4e43e346257795e171e7ee70d44/pyproject.toml#L30
       beautifultable = prev.beautifultable.overridePythonAttrs (oldAttrs: rec {
         version = "0.8.0";
         src = fetchPypi {
@@ -53,34 +41,19 @@ in
 
 py.pkgs.buildPythonPackage rec {
   pname = "irrd";
-  version = "4.4.4";
+  version = "4.5.0b1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "irrdnet";
     repo = "irrd";
     rev = "v${version}";
-    hash = "sha256-UIOKXU92JEOeVdpYLNmDBtLn0u3LMdKItcn9bFd9u8g=";
+    hash = "sha256-Hr/PbC4N/yrYeQ7bTfqIchDFmaL3c4afxV1XS7FR1F8=";
   };
 
-  patches = [
-    # starlette 0.37.2 reverted the behaviour change which this adjusted to
-    (fetchpatch {
-      url = "https://github.com/irrdnet/irrd/commit/43e26647e18f8ff3459bbf89ffbff329a0f1eed5.patch";
-      revert = true;
-      hash = "sha256-G216rHfWMZIl9GuXBz6mjHCIm3zrfDDLSmHQK/HkkzQ=";
-    })
-    # Backport build fix for webauthn 2.1
-    (fetchpatch {
-      url = "https://github.com/irrdnet/irrd/commit/20b771e1ee564f38e739fdb0a2a79c10319f638f.patch";
-      hash = "sha256-PtNdhSoFPT1kt71kFsySp/VnUpUdO23Gu9FKknHLph8=";
-      includes = [ "irrd/webui/auth/endpoints_mfa.py" ];
-    })
-  ];
-
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail psycopg2-binary psycopg2
+      --replace-fail py-radix py-radix-sr
   '';
   pythonRelaxDeps = true;
 
@@ -131,7 +104,7 @@ py.pkgs.buildPythonPackage rec {
       pydantic
       typing-extensions
       py-radix-sr
-      psycopg2
+      psycopg2-binary
       sqlalchemy
       alembic
       ujson
@@ -149,12 +122,14 @@ py.pkgs.buildPythonPackage rec {
       wtforms-bootstrap5
       email-validator
       jinja2
+      joserfc
+      time-machine
     ]
     ++ py.pkgs.uvicorn.optional-dependencies.standard;
 
   preCheck = ''
     export SMTPD_HOST=127.0.0.1
-    export IRRD_DATABASE_URL="postgres:///$PGDATABASE"
+    export IRRD_DATABASE_URL="postgresql:///$PGDATABASE"
     export IRRD_REDIS_URL="redis://localhost/1"
   '';