From f77be18e479619ffd3567453ed76fdab218f69a4 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Tue, 16 May 2023 14:54:48 +0100
Subject: [PATCH] authentik: 2023.4.0 -> 2023.5.0

---
 nix/pkgs/authentik/default.nix           |  6 +++---
 nix/pkgs/authentik/docs/default.nix      |  2 +-
 nix/pkgs/authentik/goserver/default.nix  |  2 +-
 nix/pkgs/authentik/pythonapp/default.nix | 15 ++++++++++-----
 nix/pkgs/authentik/webui/default.nix     |  2 +-
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/nix/pkgs/authentik/default.nix b/nix/pkgs/authentik/default.nix
index 733d6d5080..55460916a2 100644
--- a/nix/pkgs/authentik/default.nix
+++ b/nix/pkgs/authentik/default.nix
@@ -1,12 +1,12 @@
 { pkgs, ... }@args:
 
 let
-  version = "2023.4.0-lukegb";
+  version = "2023.5.0-lukegb";
   src = pkgs.fetchFromGitHub {
     owner = "lukegb";
     repo = "authentik";
-    rev = "c8261d76066f37586d9adc428d60f9675ceed9fb";
-    hash = "sha256:0c7a76vfmwd6flm4swpdas59d70kv166c8jly7zfjwgdf5vw1d0j";
+    rev = "9505f2f4088912bcdfbc45ee86dbdb0fb358a403";
+    hash = "sha256:1bd63lkzl9hi4l59ahbjxbncj2b967gcfivhqcbn61cpps11j1yl";
   };
   subargs = args // { inherit src version; };
 in rec {
diff --git a/nix/pkgs/authentik/docs/default.nix b/nix/pkgs/authentik/docs/default.nix
index c86b4f8d94..a85b9bcfe7 100644
--- a/nix/pkgs/authentik/docs/default.nix
+++ b/nix/pkgs/authentik/docs/default.nix
@@ -6,7 +6,7 @@ pkgs.buildNpmPackage rec {
 
   sourceRoot = "source/website";
 
-  npmDepsHash = "sha256:0hi7asn5b8ysm2vryji600kp9p3jk1s3kfskq1pmdbjx0kbn3q73";
+  npmDepsHash = "sha256:076ndnrs3iirpn618ziw8ybnrvajl47n53x5p8k9xxkd7dxngb0p";
   npmBuildFlags = "-- --config docusaurus.docs-only.js";
 
   dontNpmInstall = true;
diff --git a/nix/pkgs/authentik/goserver/default.nix b/nix/pkgs/authentik/goserver/default.nix
index 948c27a2f2..7f3cb08cbe 100644
--- a/nix/pkgs/authentik/goserver/default.nix
+++ b/nix/pkgs/authentik/goserver/default.nix
@@ -4,6 +4,6 @@ pkgs.buildGoModule {
   pname = "authentik-server";
   inherit src version;
 
-  vendorSha256 = "sha256:07rzhhczb681vaadvjxcxh7p2fm04yr1nnwfj77dy6j6wsapk8fr";
+  vendorSha256 = "sha256:1skk3pq02cl0iw6ycfy5v3hig7kwwhj1lddg0ilcarw7h3b6wg5h";
   subPackages = "cmd/server";
 }
diff --git a/nix/pkgs/authentik/pythonapp/default.nix b/nix/pkgs/authentik/pythonapp/default.nix
index 9a9200b19d..1496746d96 100644
--- a/nix/pkgs/authentik/pythonapp/default.nix
+++ b/nix/pkgs/authentik/pythonapp/default.nix
@@ -80,11 +80,16 @@ let
       pydantic-scim = assert assertVersion super.pydantic-scim "0.0.7"; super.pydantic-scim.overridePythonAttrs (old: {
         buildInputs = (old.buildInputs or []) ++ [ self.setuptools self.setuptools-scm ];
       });
-      twilio = assert assertVersion super.twilio "8.0.0"; super.twilio.overridePythonAttrs (old: {
-        postPatch = ''
-          ${old.postPatch or ""}
-          substituteInPlace setup.py --replace '"asyncio>=3.4.3",' ""
-        '';
+      sqlparse = assert assertVersion super.sqlparse "0.4.4"; super.sqlparse.overridePythonAttrs (old: {
+        buildInputs = (old.buildInputs or []) ++ [ self.flit-core ];
+      });
+      ruff = null;
+      pytest-github-actions-annotate-failures = null;
+      drf-jsonschema-serializer = assert assertVersion super.drf-jsonschema-serializer "1.0.0"; super.drf-jsonschema-serializer.overridePythonAttrs (old: {
+        buildInputs = (old.buildInputs or []) ++ [ self.setuptools ];
+      });
+      django-otp = assert assertVersion super.django-otp "1.2.0"; super.django-otp.overridePythonAttrs (old: {
+        buildInputs = (old.buildInputs or []) ++ [ self.hatchling ];
       });
     });
 
diff --git a/nix/pkgs/authentik/webui/default.nix b/nix/pkgs/authentik/webui/default.nix
index ebdd34da18..3831867e64 100644
--- a/nix/pkgs/authentik/webui/default.nix
+++ b/nix/pkgs/authentik/webui/default.nix
@@ -6,7 +6,7 @@ pkgs.buildNpmPackage {
 
   sourceRoot = "source/web";
 
-  npmDepsHash = "sha256:0gm7b80a9yinkcfzfq5s34lj7rm7v6fbbnk696ayghsr9yvcq6fl";
+  npmDepsHash = "sha256:1b9h37pvi3wm1ac4scdlz43n7nplns7qn44hxsf21cyhddvv0zc6";
 
   dontNpmInstall = true;
   installPhase = ''