tamipes/authentik-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #94 from nix-community/authentik-2026.2

Browse source 
update: 2025.12.4 -> 2026.2.0
This commit is contained in:
Maximilian Bosch 2026-02-28 18:58:35 +01:00 • committed by GitHub
commit cb09279e74
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 51 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/docs.nix
View file

@ -13,7 +13,8 @@ buildNapalmPackage "${authentik-src}/website" {
"cp -v ${authentik-src}/SECURITY.md ../SECURITY.md" "cp -v ${authentik-src}/SECURITY.md ../SECURITY.md"
"cp -vr ${authentik-src}/blueprints ../blueprints" "cp -vr ${authentik-src}/blueprints ../blueprints"
"cp -v ${authentik-src}/schema.yml ../schema.yml" "cp -v ${authentik-src}/schema.yml ../schema.yml"
"cp -v ${authentik-src}/docker-compose.yml ../docker-compose.yml" "mkdir -p ../lifecycle/container"
"cp -v ${authentik-src}/lifecycle/container/compose.yml ../lifecycle/container/compose.yml"
"npm config set loglevel verbose" "npm config set loglevel verbose"
"npm ci --workspaces --include-workspace-root --no-audit" "npm ci --workspaces --include-workspace-root --no-audit"
"npm run build" "npm run build"

12
components/fix-lxml-libxml-2.15-build.patch
View file

@ -1,12 +0,0 @@
diff --git a/src/lxml/etree.c b/src/lxml/etree.c
index 9fbfe5a..74c83c7 100644
--- a/src/lxml/etree.c
+++ b/src/lxml/etree.c
@@ -35183,7 +35183,6 @@ static void __pyx_f_4lxml_5etree_fixThreadDictNamesForDtd(xmlDtd *__pyx_v_c_dtd,
* _fixThreadDictPtr(&c_attribute.name, c_src_dict, c_dict)
* _fixThreadDictPtr(&c_attribute.prefix, c_src_dict, c_dict)
*/
- __pyx_f_4lxml_5etree__fixThreadDictPtr((&__pyx_v_c_attribute->defaultValue), __pyx_v_c_src_dict, __pyx_v_c_dict);
/* "src/lxml/proxy.pxi":578
* while c_attribute:

2
components/gopkgs.nix
View file

@ -69,7 +69,7 @@ buildGo125Module {
] ++ lib.optionals guacamoleAvailable [ ] ++ lib.optionals guacamoleAvailable [
"cmd/rac" "cmd/rac"
]; ];
vendorHash = "sha256-hdkd7/bqgTvYwlhVA9zEQny6yDowMaoRcC7TdRoXfJc="; vendorHash = "sha256-0YKn6qScUjkLOq/hyUZp7e+dQ58POSgj4CgfDro+5J4=";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
doCheck = false; doCheck = false;
postInstall = '' postInstall = ''

21
components/python-overrides.nix
View file

@ -8,6 +8,7 @@
libtool, libtool,
pkg-config, pkg-config,
xmlsec, xmlsec,
python,
}: }:
let let
@ -44,6 +45,18 @@ let
# Fixes for dependencies with C libraries. # Fixes for dependencies with C libraries.
buildFixes = final: prev: { buildFixes = final: prev: {
django-tenants = prev.django-tenants.overrideAttrs {
/*
Resolves
> FileCollisionError: Two or more packages are trying to provide the same file with different contents
>
> Files: /nix/store/snsw4gij9l7pllphdskxqmr3y5a951aq-django-tenants-3.10.0/lib/python3.14/site-packages/docs/Makefile /nix/store/dxy56wp46sm8nqjfhmfswb5k5rcwrj6y-pyrad-2.5.4/lib/python3.14/site-packages/docs/Makefile
*/
postFixup = ''
rm -r $out/${python.sitePackages}/docs
'';
};
gssapi = prev.gssapi.overrideAttrs ( gssapi = prev.gssapi.overrideAttrs (
{ {
buildInputs ? [ ], buildInputs ? [ ],
@ -77,7 +90,6 @@ let
lxml = prev.lxml.overrideAttrs ( lxml = prev.lxml.overrideAttrs (
{ {
buildInputs ? [ ], buildInputs ? [ ],
patches ? [ ],
... ...
}: }:
{ {
@ -86,13 +98,6 @@ let
libxml2 libxml2
zlib zlib
]; ];
patches = patches ++ [
# The upstream fix for this is
# https://github.com/lxml/lxml/commit/f7a813483c4482dd114e7ee8b42b54337e285503,
# however, this doesn't help us here because the `etree.c` file is already generated
# (we're using the wheel), so we have to patch the C file directly.
./fix-lxml-libxml-2.15-build.patch
];
} }
); );
xmlsec = prev.xmlsec.overrideAttrs ( xmlsec = prev.xmlsec.overrideAttrs (

56
flake.lock generated
View file

@ -3,11 +3,11 @@
"authentik-go": { "authentik-go": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1770333754, "lastModified": 1771856219,
"narHash": "sha256-Yyna75Nd6485tZP9IpdEa5QNomswe9hRfM+w3MuET9E=", "narHash": "sha256-zTEmvxe+BpfWYvAl675PnhXCH4jV4GUTFb1MrQ1Eyno=",
"owner": "goauthentik", "owner": "goauthentik",
"repo": "client-go", "repo": "client-go",
"rev": "280022b0a8de5c8f4b2965d1147a1c4fa846ba64", "rev": "4c1444ee54d945fbcc5ae107b4f191ca0352023d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -19,16 +19,16 @@
"authentik-src": { "authentik-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1770911230, "lastModified": 1771963976,
"narHash": "sha256-alTyrMBbjZbw4jhEna8saabf93sqSrZCu+Z5xH3pZ7M=", "narHash": "sha256-pVQ34cZYX3hlk6hF1aZ/n32xMqTF4Jmp0G0VGDU7iXc=",
"owner": "goauthentik", "owner": "goauthentik",
"repo": "authentik", "repo": "authentik",
"rev": "19ad8d3ae3f266ec1096bc4461fdf6bcda1aa079", "rev": "8af491630b70ff6bd089753e21bef511bfb3f557",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "goauthentik", "owner": "goauthentik",
"ref": "version/2025.12.4", "ref": "version/2026.2.0",
"repo": "authentik", "repo": "authentik",
"type": "github" "type": "github"
} }
@ -36,11 +36,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765121682, "lastModified": 1767039857,
"narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=", "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3", "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -54,11 +54,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1765835352, "lastModified": 1769996383,
"narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "a34fae9c08a15ad73f295041fec82323541400a9", "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -113,11 +113,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1768305791, "lastModified": 1771848320,
"narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -129,11 +129,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1765674936, "lastModified": 1769909678,
"narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", "rev": "72716169fe93074c333e8d0173151350670b824c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -155,11 +155,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1763662255, "lastModified": 1771423342,
"narHash": "sha256-4bocaOyLa3AfiS8KrWjZQYu+IAta05u3gYZzZ6zXbT0=", "narHash": "sha256-7uXPiWB0YQ4HNaAqRvVndYL34FEp1ZTwVQHgZmyMtC8=",
"owner": "pyproject-nix", "owner": "pyproject-nix",
"repo": "build-system-pkgs", "repo": "build-system-pkgs",
"rev": "042904167604c681a090c07eb6967b4dd4dae88c", "rev": "04e9c186e01f0830dad3739088070e4c551191a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -175,11 +175,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764134915, "lastModified": 1771518446,
"narHash": "sha256-xaKvtPx6YAnA3HQVp5LwyYG1MaN4LLehpQI8xEdBvBY=", "narHash": "sha256-nFJSfD89vWTu92KyuJWDoTQJuoDuddkJV3TlOl1cOic=",
"owner": "pyproject-nix", "owner": "pyproject-nix",
"repo": "pyproject.nix", "repo": "pyproject.nix",
"rev": "2c8df1383b32e5443c921f61224b198a2282a657", "rev": "eb204c6b3335698dec6c7fc1da0ebc3c6df05937",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -228,11 +228,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765631794, "lastModified": 1772187362,
"narHash": "sha256-90d//IZ4GXipNsngO4sb2SAPbIC/a2P+IAdAWOwpcOM=", "narHash": "sha256-gCojeIlQ/rfWMe3adif3akyHsT95wiMkLURpxTeqmPc=",
"owner": "pyproject-nix", "owner": "pyproject-nix",
"repo": "uv2nix", "repo": "uv2nix",
"rev": "4cca323a547a1aaa9b94929c4901bed5343eafe8", "rev": "abe65de114300de41614002fe9dce2152ac2ac23",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View file

@ -42,7 +42,7 @@
}; };
authentik-src = { authentik-src = {
# change version string in outputs as well when updating # change version string in outputs as well when updating
url = "github:goauthentik/authentik/version/2025.12.4"; url = "github:goauthentik/authentik/version/2026.2.0";
flake = false; flake = false;
}; };
authentik-go = { authentik-go = {
@ -72,7 +72,7 @@
... ...
}: }:
let let
authentik-version = "2025.12.4"; # to pass to the drvs of some components authentik-version = "2026.2.0"; # to pass to the drvs of some components
in in
{ {
systems = import inputs.systems; systems = import inputs.systems;
@ -114,7 +114,7 @@
{ {
pkgs, pkgs,
system ? pkgs.stdenv.hostPlatform.system, system ? pkgs.stdenv.hostPlatform.system,
python ? pkgs.python313, python ? pkgs.python314,
authentik-version ? authentik-version', authentik-version ? authentik-version',
buildNapalmPackage ? napalm.legacyPackages.${system}.buildPackage, buildNapalmPackage ? napalm.legacyPackages.${system}.buildPackage,
}: }:

3
tests/minimal-vmtest.nix
View file

@ -9,7 +9,7 @@ pkgs.testers.runNixOSTest {
authentik = { authentik = {
virtualisation = { virtualisation = {
cores = 3; cores = 3;
memorySize = 2048; memorySize = 3072;
}; };
imports = [ imports = [
nixosModules.default nixosModules.default
@ -33,6 +33,7 @@ pkgs.testers.runNixOSTest {
enable = true; enable = true;
host = "localhost"; host = "localhost";
}; };
settings.disable_update_check = true;
}; };
services.xserver.enable = true; services.xserver.enable = true;

3
tests/override-scope.nix
View file

@ -48,7 +48,7 @@ pkgs.testers.runNixOSTest {
authentik = { authentik = {
virtualisation = { virtualisation = {
cores = 3; cores = 3;
memorySize = 2048; memorySize = 3072;
}; };
imports = [ imports = [
nixosModules.default nixosModules.default
@ -74,6 +74,7 @@ pkgs.testers.runNixOSTest {
}; };
# pass authentikComponents with patched pythonEnv and staticWorkdirDeps # pass authentikComponents with patched pythonEnv and staticWorkdirDeps
inherit (customScope) authentikComponents; inherit (customScope) authentikComponents;
settings.disable_update_check = true;
}; };
services.xserver.enable = true; services.xserver.enable = true;