From fe09f27f70d0b0643d88d416c16953833202db04 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Sun, 4 Dec 2022 02:30:53 +0000
Subject: [PATCH] nix/pkgs/authentik: 2022.8.1 -> 2022.11.3

---
 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 | 38 ++++++++++--------------
 nix/pkgs/authentik/webui/default.nix     |  2 +-
 5 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/nix/pkgs/authentik/default.nix b/nix/pkgs/authentik/default.nix
index 9ce3542981..9fe1fec8b1 100644
--- a/nix/pkgs/authentik/default.nix
+++ b/nix/pkgs/authentik/default.nix
@@ -1,12 +1,12 @@
 { pkgs, ... }@args:
 
 let
-  version = "2022.8.1-lukegb";
+  version = "2022.11.3-lukegb";
   src = pkgs.fetchFromGitHub {
     owner = "lukegb";
     repo = "authentik";
-    rev = "6df74b42786facde859a7809b534f929a2499fc2";
-    hash = "sha256:14hbihpb9wy8nc5qsibz4h0nwlnd4azb9i1w4isba5406rfxax3f";
+    rev = "a329164ec0f917d39a6d448c8c462d99dfe2c21a";
+    hash = "sha256:17911l1v37iwyxf0y038as4plkn2w57axf0n5fiyr8pspfj6w6w2";
   };
   subargs = args // { inherit src version; };
 in rec {
diff --git a/nix/pkgs/authentik/docs/default.nix b/nix/pkgs/authentik/docs/default.nix
index e899c9ff0e..67317a8882 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:1f8m97w8ib6yfrdp28r0mjl49mbxikfkyap6by7fxmcgirvdx6xg";
+  npmDepsHash = "sha256:14irk0j3mbc4g5ps3hgps19brv98ggkc438vdz7v1b0ardjl3mpg";
   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 e3b75da074..dabfbe398d 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 = "09r4xgcslhz3dc0kr6df6ak7x7r8602jpj4g48s3ljqn19bp9iav";
+  vendorSha256 = "0gzwxnzinsnr5drcpxj8009jpwrvlwmpzy0yxf1v6j6chbpgj4x1";
   subPackages = "cmd/server";
 }
diff --git a/nix/pkgs/authentik/pythonapp/default.nix b/nix/pkgs/authentik/pythonapp/default.nix
index ab0ab6c2e4..731dbca70e 100644
--- a/nix/pkgs/authentik/pythonapp/default.nix
+++ b/nix/pkgs/authentik/pythonapp/default.nix
@@ -1,7 +1,6 @@
-{ depot, src, ... }:
+{ depot, src, pkgs, ... }:
 
 let
-  pkgs = depot.third_party.nixpkgsOld;
   inherit (pkgs) poetry2nix;
   pyproject = pkgs.runCommand "authentik-pyproject" { src = "${src}/pyproject.toml"; } ''
     sed 's/extras = \["standard"\],//' $src > $out
@@ -19,10 +18,19 @@ let
   '';
   app = poetry2nix.mkPoetryApplication rec {
     projectDir = fixedSrc;
-    python = pkgs.python310;
+    python = pkgs.python311;
     overrides = poetry2nix.overrides.withDefaults (self: super: {
+      dumb-init = super.dumb-init.overridePythonAttrs (old: {
+        nativeBuildInputs = old.nativeBuildInputs ++ [ self.setuptools ];
+      });
       click-didyoumean = super.click-didyoumean.overridePythonAttrs (old: {
-        nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ self.poetry ];
+        nativeBuildInputs = old.nativeBuildInputs ++ [ self.poetry ];
+      });
+      bump2version = super.bump2version.overridePythonAttrs (old: {
+        nativeBuildInputs = old.nativeBuildInputs ++ [ self.setuptools ];
+      });
+      opencontainers = super.opencontainers.overridePythonAttrs (old: {
+        nativeBuildInputs = old.nativeBuildInputs ++ [ self.setuptools self.pytest-runner ];
       });
       xmlsec = super.xmlsec.overridePythonAttrs (old: {
         nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ self.pkgconfig ];
@@ -36,26 +44,10 @@ let
           sha256 = "59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e";
         };
       });
-      hatch-vcs = (super.hatch-vcs or (self.buildPythonPackage rec {
-        pname = "hatch-vcs";
-        version = "0.2.0";
-        format = "pyproject";
-
-        nativeBuildInputs = with self; [ hatchling ];
-        propagatedBuildInputs = with self; [ hatchling setuptools-scm ];
-        checkInputs = with self; [ pkgs.git pytestCheckHook ];
-
-        src = self.fetchPypi {
-          pname = "hatch_vcs";
-          inherit version;
-          sha256 = "1zxb12lrrl1n7ijcxl8mvv94lnhn6b52c1jx6jq9pv2fncrxf4wr";
-        };
-      }));
-      watchfiles = self.callPackage "${pkgs.path}/pkgs/development/python-modules/watchfiles/default.nix" {};
-      uvicorn = (self.callPackage "${pkgs.path}/pkgs/development/python-modules/uvicorn/default.nix" {}).overridePythonAttrs (old: {
-        propagatedBuildInputs = old.propagatedBuildInputs ++ old.passthru.optional-dependencies.standard;
+      urllib3-secure-extra = super.urllib3-secure-extra.overridePythonAttrs (old: {
+        nativeBuildInputs = old.nativeBuildInputs ++ [ self.flit-core ];
       });
-      inherit (pkgs.python310.pkgs) ua-parser;
+      watchfiles = self.callPackage "${pkgs.path}/pkgs/development/python-modules/watchfiles/default.nix" {};
     });
 
     buildInputs = [ pkgs.bash ];
diff --git a/nix/pkgs/authentik/webui/default.nix b/nix/pkgs/authentik/webui/default.nix
index 67392f4f7c..dcd0f56f4a 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:1fdry3ckzl4hyb3f0k4kp4m5chbi94na9y6530rpzc2803khwmnx";
+  npmDepsHash = "sha256:0s60hqjy97vmgiql0aypxq8qkax40z97v539szambg0q0zbrrg4a";
 
   dontNpmInstall = true;
   installPhase = ''