lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

authentik: 2023.10.5.2 -> 2024.2.1

Browse source
This commit is contained in:
Luke Granger-Brown 2024-03-01 23:49:17 +00:00
parent d987c2cad3
commit 6d7ea49ce0
7 changed files with 71 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nix/pkgs/authentik/default.nix
View file

@ -1,12 +1,12 @@
{ pkgs, ... }@args: { pkgs, ... }@args:
let let
version = "2023.10.5.2-lukegb"; version = "2024.2.1-lukegb";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "lukegb"; owner = "lukegb";
repo = "authentik"; repo = "authentik";
rev = "9ea1129ca7948641649ec7f9e7199dbd63aa41d1"; rev = "7bc32aa0e466824b7b21514c4e855b963268cde8";
hash = "sha256:1bipfilavgbfdx4ypidf5vh69mnqamy0ibppdp0kkj9dcdnyva9w"; hash = "sha256:0q4yq0x320x0gfiyjs7kcnh83vq1c50xjsh56l9z7yaxqvc9z1qp";
}; };
subargs = args // { inherit src version; }; subargs = args // { inherit src version; };
in rec { in rec {

4
nix/pkgs/authentik/docs/default.nix
View file

@ -6,8 +6,8 @@ pkgs.buildNpmPackage rec {
sourceRoot = "source/website"; sourceRoot = "source/website";
npmDepsHash = "sha256:1sa7yb4vrkxj26rn4pxrhjm7blw63k0kd43lwsvrz7nc9g20bn71"; npmDepsHash = "sha256:03w483wh6dxarwh3bp6dva1r7kcy9py0lcg95l94915vf42h5855";
npmBuildFlags = "-- --config docusaurus.docs-only.js"; npmBuildFlags = "-- --config docusaurus.docs-only.ts";
dontNpmInstall = true; dontNpmInstall = true;
installPhase = '' installPhase = ''

2
nix/pkgs/authentik/goserver/default.nix
View file

@ -4,6 +4,6 @@ pkgs.buildGoModule {
pname = "authentik-server"; pname = "authentik-server";
inherit src version; inherit src version;
vendorHash = "sha256:13mx1xrjbn186c0x30c81axabnpiz4618wshvy2wap3vmzarrzbs"; vendorHash = "sha256:0drzpccf3qrdhb5f2lv7lp2yaa81nhf60wr25g95c740931xiws4";
subPackages = "cmd/server"; subPackages = "cmd/server";
} }

77
nix/pkgs/authentik/pythonapp/default.nix
View file

@ -68,21 +68,6 @@ let
urllib3-secure-extra = super.urllib3-secure-extra.overridePythonAttrs (old: { urllib3-secure-extra = super.urllib3-secure-extra.overridePythonAttrs (old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ self.flit-core ]; nativeBuildInputs = old.nativeBuildInputs ++ [ self.flit-core ];
}); });
#watchfiles = self.callPackage ../../../../third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix { CoreServices = null; };
#kombu = assert assertVersion super.kombu "5.2.4"; super.kombu.overridePythonAttrs (old: {
# buildInputs = (old.buildInputs or []) ++ [ self.setuptools ];
# postPatch = ''
# ${old.postPatch or ""}
# substituteInPlace requirements/test.txt --replace "pytz>dev" "pytz"
# '';
#});
#isort = assert assertVersion super.isort "5.10.1"; super.isort.overridePythonAttrs (old: {
# postPatch = ''
# ${old.postPatch or ""}
# substituteInPlace pyproject.toml --replace "pip-shims<=0.3.4" "pip-shims"
# '';
#});
asyncio = null; asyncio = null;
pyrad = assert assertVersion super.pyrad "2.4"; super.pyrad.overridePythonAttrs (old: { pyrad = assert assertVersion super.pyrad "2.4"; super.pyrad.overridePythonAttrs (old: {
patches = [ (pkgs.fetchpatch { patches = [ (pkgs.fetchpatch {
@ -104,43 +89,53 @@ let
gunicorn = assert assertVersion super.gunicorn "21.2.0"; super.gunicorn.overridePythonAttrs (old: { gunicorn = assert assertVersion super.gunicorn "21.2.0"; super.gunicorn.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or []) ++ [ self.packaging ]; buildInputs = (old.buildInputs or []) ++ [ self.packaging ];
}); });
psycopg-c = assert assertVersion super.psycopg-c "3.1.12"; super.psycopg-c.overridePythonAttrs (old: { django-tenants = assert assertVersion super.django-tenants "3.6.1"; super.django-tenants.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or []) ++ [ self.setuptools ];
});
psycopg-c = assert assertVersion super.psycopg-c "3.1.18"; super.psycopg-c.overridePythonAttrs (old: {
propagatedBuildInputs = (old.propagatedBuildInputs or []) ++ [ self.tomli ]; propagatedBuildInputs = (old.propagatedBuildInputs or []) ++ [ self.tomli ];
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkgs.postgresql ]; nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkgs.postgresql ];
buildInputs = (old.buildInputs or []) ++ [ self.setuptools ]; buildInputs = (old.buildInputs or []) ++ [ self.setuptools ];
}); });
rpds-py = assert assertVersion super.rpds-py "0.10.0"; super.rpds-py.overridePythonAttrs (old: { #rpds-py = assert assertVersion super.rpds-py "0.16.2"; super.rpds-py.overridePythonAttrs (old: {
cargoDeps = pkgs.rustPlatform.importCargoLock { # cargoDeps = pkgs.rustPlatform.importCargoLock {
lockFile = ./Cargo.rpds-py.lock; # lockFile = ./Cargo.rpds-py.lock;
}; # };
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ # nativeBuildInputs = (old.nativeBuildInputs or []) ++ [
pkgs.cargo # pkgs.cargo
pkgs.rustPlatform.cargoSetupHook # pkgs.rustPlatform.cargoSetupHook
pkgs.rustPlatform.maturinBuildHook # pkgs.rustPlatform.maturinBuildHook
pkgs.rustc # pkgs.rustc
]; # ];
});
#annotated-types = assert assertVersion super.annotated-types "0.5.0"; super.annotated-types.overridePythonAttrs (old: {
# nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkgs.cargo pkgs.rustc pkgs.maturin ];
#}); #});
annotated-types = assert assertVersion super.annotated-types "0.5.0"; super.annotated-types.overridePythonAttrs (old: { #annotated-types = assert assertVersion super.annotated-types "0.6.0"; super.annotated-types.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or []) ++ [ self.hatchling ]; # buildInputs = (old.buildInputs or []) ++ [ self.hatchling ];
#});
#service-identity = assert assertVersion super.service-identity "24.1.0"; super.service-identity.overridePythonAttrs (old: {
# buildInputs = (old.buildInputs or []) ++ [ self.hatchling self.hatch-vcs self.hatch-fancy-pypi-readme ];
#});
lxml = assert assertVersion super.lxml "5.1.0"; super.lxml.overridePythonAttrs (old: {
name = "lxml-4.9.4";
version = "4.9.4";
src = pkgs.fetchFromGitHub {
owner = "lxml";
repo = "lxml";
rev = "lxml-4.9.4";
sha256 = "sha256:160x1z93q916lqcj571g7295hyl8an8dnppni2lmcy1ppz0v8bd9";
};
}); });
service-identity = assert assertVersion super.service-identity "23.1.0"; super.service-identity.overridePythonAttrs (old: { twisted = assert assertVersion super.twisted "23.10.0"; super.twisted.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or []) ++ [ self.hatchling self.hatch-vcs self.hatch-fancy-pypi-readme ];
});
twisted = assert assertVersion super.twisted "23.8.0"; super.twisted.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or []) ++ [ self.hatchling self.hatch-fancy-pypi-readme self.incremental ]; buildInputs = (old.buildInputs or []) ++ [ self.hatchling self.hatch-fancy-pypi-readme self.incremental ];
}); });
argon2-cffi = assert assertVersion super.argon2-cffi "23.1.0"; super.argon2-cffi.overridePythonAttrs (old: { argon2-cffi = assert assertVersion super.argon2-cffi "23.1.0"; super.argon2-cffi.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or []) ++ [ self.hatchling self.hatch-vcs self.hatch-fancy-pypi-readme ]; buildInputs = (old.buildInputs or []) ++ [ self.hatchling self.hatch-vcs self.hatch-fancy-pypi-readme ];
}); });
referencing = assert assertVersion super.referencing "0.30.2"; super.referencing.overridePythonAttrs (old: { #referencing = assert assertVersion super.referencing "0.32.1"; super.referencing.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or []) ++ [ self.hatchling self.hatch-vcs ]; # buildInputs = (old.buildInputs or []) ++ [ self.hatchling self.hatch-vcs ];
}); #});
jsonschema-specifications = assert assertVersion super.jsonschema-specifications "2023.7.1"; super.jsonschema-specifications.overridePythonAttrs (old: { #jsonschema-specifications = assert assertVersion super.jsonschema-specifications "2023.12.1"; super.jsonschema-specifications.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or []) ++ [ self.hatchling self.hatch-vcs ]; # buildInputs = (old.buildInputs or []) ++ [ self.hatchling self.hatch-vcs ];
}); #});
}); });
buildInputs = [ pkgs.bash ]; buildInputs = [ pkgs.bash ];

2
nix/pkgs/authentik/webui/default.nix
View file

@ -7,7 +7,7 @@ pkgs.buildNpmPackage {
sourceRoot = "source/web"; sourceRoot = "source/web";
nativeBuildInputs = [ pkgs.python3 ]; nativeBuildInputs = [ pkgs.python3 ];
npmDepsHash = "sha256:12d637kdmcmrbm99idyppyii0pd1yf6qk6573aili87d1aa8m875"; npmDepsHash = "sha256:1v69zmbksras3b3fggiqkfaj727gjb3v9x0a9ziyxamyb7vyrp2y";
dontNpmInstall = true; dontNpmInstall = true;
installPhase = '' installPhase = ''

19
third_party/default.nix vendored
View file

@ -82,12 +82,25 @@ let
rev = "e0fe990b478a66178a58c69cf53daec0478ca6f9"; rev = "e0fe990b478a66178a58c69cf53daec0478ca6f9";
sha256 = "sha256:0qjyfmw5v7s6ynjns4a61vlyj9cghj7vbpgrp9147ngb1f8krz2c"; sha256 = "sha256:0qjyfmw5v7s6ynjns4a61vlyj9cghj7vbpgrp9147ngb1f8krz2c";
}; };
poetry2nixSrc = nixpkgs.fetchFromGitHub { poetry2nixSrcRaw = nixpkgs.fetchFromGitHub {
owner = "nix-community"; owner = "nix-community";
repo = "poetry2nix"; repo = "poetry2nix";
rev = "528d500ea826383cc126a9be1e633fc92b19ce5d"; rev = "3c92540611f42d3fb2d0d084a6c694cd6544b609";
hash = "sha256:1q245v4q0bb30ncfj66gl6dl1k46am28x7kjj6d3y7r6l4fzppq8"; hash = "sha256:1jfrangw0xb5b8sdkimc550p3m98zhpb1fayahnr7crg74as4qyq";
}; };
poetry2nixSrc = nixpkgs.runCommand "poetry2nix-patched" {
patches = [
./poetry2nix-cryptography-42.0.4.patch
];
src = poetry2nixSrcRaw;
} ''
cp -R $src $out
chmod -R +w $out
cd $out
for p in $patches; do
patch -p1 < "$p"
done
'';
tvlDepot = import ./tvl { nixpkgsBisectPath = ./nixpkgs; inherit nixpkgsConfig; nixpkgsSystem = system; }; tvlDepot = import ./tvl { nixpkgsBisectPath = ./nixpkgs; inherit nixpkgsConfig; nixpkgsSystem = system; };
in in

12
third_party/poetry2nix-cryptography-42.0.4.patch vendored Normal file
View file

@ -0,0 +1,12 @@
diff --git a/overrides/default.nix b/overrides/default.nix
index c0f6dab200...ccbdedc947 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -559,6 +559,7 @@
"42.0.1" = "sha256-Kq/TSoI1cm9Pwg5CulNlAADmxdq0oWbgymHeMErUtcE=";
"42.0.2" = "sha256-jw/FC5rQO77h6omtBp0Nc2oitkVbNElbkBUduyprTIc=";
"42.0.3" = "sha256-QBZLGXdQz2WIBlAJM+yBk1QgmfF4b3G0Y1I5lZmAmtU=";
+ "42.0.4" = "sha256-qaXQiF1xZvv4sNIiR2cb5TfD7oNiYdvUwcm37nh2P2M=";
}.${version} or (
lib.warn "Unknown cryptography version: '${version}'. Please update getCargoHash." lib.fakeHash
);