From 6b47f2c016be8db8066bba03bce2a1086ad00dd0 Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Thu, 14 Nov 2024 12:24:34 +0100
Subject: [PATCH 1/2] python3Packages.hikari: format using nixfmt

(cherry picked from commit d4246a0c9054898a6053d6e8d5a0e736646ca37c)
---
 pkgs/development/python-modules/hikari/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hikari/default.nix b/pkgs/development/python-modules/hikari/default.nix
index 92a26c231d0c2b..20ce85709640b9 100644
--- a/pkgs/development/python-modules/hikari/default.nix
+++ b/pkgs/development/python-modules/hikari/default.nix
@@ -35,7 +35,6 @@ buildPythonPackage rec {
     '';
   };
 
-
   propagatedBuildInputs = [
     aiohttp
     attrs
@@ -71,6 +70,9 @@ buildPythonPackage rec {
     homepage = "https://www.hikari-py.dev/";
     changelog = "https://github.com/hikari-py/hikari/releases/tag/${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ tomodachi94 sigmanificient ];
+    maintainers = with lib.maintainers; [
+      tomodachi94
+      sigmanificient
+    ];
   };
 }

From f654eacd9960f670e1c8c64440c00d0ab4221560 Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Thu, 14 Nov 2024 12:22:47 +0100
Subject: [PATCH 2/2] python3Packages.hikari: fix build Remove the
 `asyncio_default_fixture_loop_scope` from pyproject.toml

(cherry picked from commit f278e7f42c94fcd3944295699cea8307d5413f63)
---
 pkgs/development/python-modules/hikari/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/hikari/default.nix b/pkgs/development/python-modules/hikari/default.nix
index 20ce85709640b9..915c77e1e15698 100644
--- a/pkgs/development/python-modules/hikari/default.nix
+++ b/pkgs/development/python-modules/hikari/default.nix
@@ -63,6 +63,9 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace hikari/_about.py \
       --replace-fail "__git_sha1__: typing.Final[str] = \"HEAD\"" "__git_sha1__: typing.Final[str] = \"$(cat $src/COMMIT)\""
+    # XXX: Remove once pytest-asyncio is updated to 0.24+
+    substituteInPlace pyproject.toml \
+      --replace-fail "asyncio_default_fixture_loop_scope = \"func\"" ""
   '';
 
   meta = {