authentik: 2023.2.3-lukegb -> 2023.4.0-lukegb

This commit is contained in:
Luke Granger-Brown 2023-04-15 02:45:00 +00:00
parent 857e659f1f
commit 226c62a740
5 changed files with 20 additions and 7 deletions

View file

@ -1,12 +1,12 @@
{ pkgs, ... }@args:
let
version = "2023.2.3-lukegb";
version = "2023.4.0-lukegb";
src = pkgs.fetchFromGitHub {
owner = "lukegb";
repo = "authentik";
rev = "fcd42c76723cdef7d4c316588ba15b41e628d69a";
hash = "sha256:0r3mzmf1vpmhd2sx1y37vcbix4im26fn5r5msw2w50iya28jkg6s";
rev = "c8261d76066f37586d9adc428d60f9675ceed9fb";
hash = "sha256:0c7a76vfmwd6flm4swpdas59d70kv166c8jly7zfjwgdf5vw1d0j";
};
subargs = args // { inherit src version; };
in rec {

View file

@ -6,7 +6,7 @@ pkgs.buildNpmPackage rec {
sourceRoot = "source/website";
npmDepsHash = "sha256:00ih8nfiiwggbhbx3kcr6iids16zql1ad2zx6kd5i84j0ncsxwrk";
npmDepsHash = "sha256:0hi7asn5b8ysm2vryji600kp9p3jk1s3kfskq1pmdbjx0kbn3q73";
npmBuildFlags = "-- --config docusaurus.docs-only.js";
dontNpmInstall = true;

View file

@ -4,6 +4,6 @@ pkgs.buildGoModule {
pname = "authentik-server";
inherit src version;
vendorSha256 = "1wvbbr2z85anbsk8dlv6004mmvn6mlp958m0h8lxbgpk9avvjxgw";
vendorSha256 = "sha256:07rzhhczb681vaadvjxcxh7p2fm04yr1nnwfj77dy6j6wsapk8fr";
subPackages = "cmd/server";
}

View file

@ -73,6 +73,19 @@ let
substituteInPlace pyproject.toml --replace "pip-shims<=0.3.4" "pip-shims"
'';
});
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 ];
});
twilio = assert assertVersion super.twilio "8.0.0"; super.twilio.overridePythonAttrs (old: {
postPatch = ''
${old.postPatch or ""}
substituteInPlace setup.py --replace '"asyncio>=3.4.3",' ""
'';
});
});
buildInputs = [ pkgs.bash ];
@ -80,7 +93,7 @@ let
postInstall = ''
mkdir -p $out/share/authentik
touch $out/share/authentik/__init__.py
cp -r ${src}/xml $out/share/authentik/xml
cp -r ${src}/schemas $out/share/authentik/schemas
cp -r ${src}/lifecycle $out/share/authentik/lifecycle
wrapProgram $out/bin/ak \

View file

@ -6,7 +6,7 @@ pkgs.buildNpmPackage {
sourceRoot = "source/web";
npmDepsHash = "sha256:12isrjcrldz1zyccdy46cr8x6bxjlf5603g8m1yg8dar3ajp4b6h";
npmDepsHash = "sha256:0gm7b80a9yinkcfzfq5s34lj7rm7v6fbbnk696ayghsr9yvcq6fl";
dontNpmInstall = true;
installPhase = ''