From 193a2ce93c63629fd18d56a36e50e920bdab613b Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Mon, 1 Jan 2024 17:13:02 +0000 Subject: [PATCH] authentik: 2023.8.3 -> 2023.10.5.2 --- 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 | 28 +++++------------------- nix/pkgs/authentik/webui/default.nix | 2 +- 5 files changed, 12 insertions(+), 28 deletions(-) diff --git a/nix/pkgs/authentik/default.nix b/nix/pkgs/authentik/default.nix index 1e1c217e24..10b638987a 100644 --- a/nix/pkgs/authentik/default.nix +++ b/nix/pkgs/authentik/default.nix @@ -1,12 +1,12 @@ { pkgs, ... }@args: let - version = "2023.8.3-lukegb"; + version = "2023.10.5.2-lukegb"; src = pkgs.fetchFromGitHub { owner = "lukegb"; repo = "authentik"; - rev = "155a299157734fb848b20eaf38a09e0efa3fa59a"; - hash = "sha256:1bid1yw0xjcy2bb0mp9sp53v3hdx871d2864mxgc8m4sqjmrfavk"; + rev = "9ea1129ca7948641649ec7f9e7199dbd63aa41d1"; + hash = "sha256:1bipfilavgbfdx4ypidf5vh69mnqamy0ibppdp0kkj9dcdnyva9w"; }; subargs = args // { inherit src version; }; in rec { diff --git a/nix/pkgs/authentik/docs/default.nix b/nix/pkgs/authentik/docs/default.nix index 881a81efdc..eebce01e10 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:19yn1sm8nh6bvwnf60z0m93yr0vg29fqdr7zpf67rxci54k39liy"; + npmDepsHash = "sha256:1sa7yb4vrkxj26rn4pxrhjm7blw63k0kd43lwsvrz7nc9g20bn71"; 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 9cfe2e414e..46da51d402 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; - vendorHash = "sha256:1jn30nca1g0853rj0wrmqc4x3pfvr2kf8kklnxzvqg471ywlhln4"; + vendorHash = "sha256:13mx1xrjbn186c0x30c81axabnpiz4618wshvy2wap3vmzarrzbs"; subPackages = "cmd/server"; } diff --git a/nix/pkgs/authentik/pythonapp/default.nix b/nix/pkgs/authentik/pythonapp/default.nix index 197de1f283..05e78a0784 100644 --- a/nix/pkgs/authentik/pythonapp/default.nix +++ b/nix/pkgs/authentik/pythonapp/default.nix @@ -85,15 +85,15 @@ let #}); asyncio = null; pyrad = assert assertVersion super.pyrad "2.4"; super.pyrad.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or []) ++ [ self.poetry ]; - }); - pydantic-scim = assert assertVersion super.pydantic-scim "0.0.7"; super.pydantic-scim.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or []) ++ [ self.setuptools self.setuptools-scm ]; + patches = [ (pkgs.fetchpatch { + url = "https://github.com/pyradius/pyrad/commit/ffe182a44909e8f8278fb3e2ea052ddc097b48b9.patch"; + hash = "sha256:116lnhrbcpf5ni87wmzqqg17m8havn4fb5575slpgw7svsv83i2z"; + }) ]; + nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ self.poetry-core ]; }); 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 "2.0.0"; super.drf-jsonschema-serializer.overridePythonAttrs (old: { buildInputs = (old.buildInputs or []) ++ [ self.setuptools ]; @@ -104,24 +104,11 @@ let gunicorn = assert assertVersion super.gunicorn "21.2.0"; super.gunicorn.overridePythonAttrs (old: { buildInputs = (old.buildInputs or []) ++ [ self.packaging ]; }); - psycopg-c = assert assertVersion super.psycopg-c "3.1.10"; super.psycopg-c.overridePythonAttrs (old: { + psycopg-c = assert assertVersion super.psycopg-c "3.1.12"; super.psycopg-c.overridePythonAttrs (old: { propagatedBuildInputs = (old.propagatedBuildInputs or []) ++ [ self.tomli ]; nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkgs.postgresql ]; buildInputs = (old.buildInputs or []) ++ [ self.setuptools ]; }); - pydantic-core = assert assertVersion super.pydantic-core "2.6.3"; super.pydantic-core.overridePythonAttrs (old: { - cargoDeps = pkgs.rustPlatform.importCargoLock { - lockFile = ./Cargo.pydantic-core.lock; - }; - nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ - pkgs.cargo - pkgs.rustPlatform.cargoSetupHook - pkgs.rustPlatform.maturinBuildHook - pkgs.rustc - self.typing-extensions - ]; - propagatedBuildInputs = (old.propagatedBuildInputs or []) ++ [ self.typing-extensions ]; - }); rpds-py = assert assertVersion super.rpds-py "0.10.0"; super.rpds-py.overridePythonAttrs (old: { cargoDeps = pkgs.rustPlatform.importCargoLock { lockFile = ./Cargo.rpds-py.lock; @@ -151,9 +138,6 @@ let referencing = assert assertVersion super.referencing "0.30.2"; super.referencing.overridePythonAttrs (old: { buildInputs = (old.buildInputs or []) ++ [ self.hatchling self.hatch-vcs ]; }); - pydantic = assert assertVersion super.pydantic "2.3.0"; super.pydantic.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or []) ++ [ self.hatchling self.hatch-fancy-pypi-readme ]; - }); jsonschema-specifications = assert assertVersion super.jsonschema-specifications "2023.7.1"; super.jsonschema-specifications.overridePythonAttrs (old: { buildInputs = (old.buildInputs or []) ++ [ self.hatchling self.hatch-vcs ]; }); diff --git a/nix/pkgs/authentik/webui/default.nix b/nix/pkgs/authentik/webui/default.nix index 03e4e180fa..9c187d9c39 100644 --- a/nix/pkgs/authentik/webui/default.nix +++ b/nix/pkgs/authentik/webui/default.nix @@ -7,7 +7,7 @@ pkgs.buildNpmPackage { sourceRoot = "source/web"; nativeBuildInputs = [ pkgs.python3 ]; - npmDepsHash = "sha256:17ad4wd7gy7pddnbxrhwjh5d2gfp2vslflpzrp3m5v80qnpas8lh"; + npmDepsHash = "sha256:12d637kdmcmrbm99idyppyii0pd1yf6qk6573aili87d1aa8m875"; dontNpmInstall = true; installPhase = ''