authentik: update

This commit is contained in:
Luke Granger-Brown 2023-04-02 12:06:56 +00:00
parent 451f17d931
commit 2c8ab01aa8

View file

@ -1,4 +1,4 @@
{ depot, src, pkgs, ... }: { depot, src, pkgs, lib, ... }:
let let
inherit (pkgs) poetry2nix; inherit (pkgs) poetry2nix;
@ -19,7 +19,9 @@ let
app = poetry2nix.mkPoetryApplication rec { app = poetry2nix.mkPoetryApplication rec {
projectDir = fixedSrc; projectDir = fixedSrc;
python = pkgs.python311; python = pkgs.python311;
overrides = poetry2nix.overrides.withDefaults (self: super: { overrides = let
assertVersion = pkg: wantVersion: lib.assertMsg (pkg.version == wantVersion) "${pkg.pname} (${pkg.version}) is different to what I expected (${wantVersion}); maybe remove the override?";
in poetry2nix.overrides.withDefaults (self: super: {
cython = super.cython.overridePythonAttrs (oldAttrs: rec { cython = super.cython.overridePythonAttrs (oldAttrs: rec {
version = "0.29.33"; version = "0.29.33";
src = self.fetchPypi { src = self.fetchPypi {
@ -58,10 +60,18 @@ let
}); });
watchfiles = self.callPackage ../../../../third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix { CoreServices = null; }; watchfiles = self.callPackage ../../../../third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix { CoreServices = null; };
cryptography = super.cryptography.overridePythonAttrs (old: { kombu = assert assertVersion super.kombu "5.2.4"; super.kombu.overridePythonAttrs (old: {
cargoDeps = old.cargoDeps.overrideAttrs ({ outputHash, ... }: { buildInputs = (old.buildInputs or []) ++ [ self.setuptools ];
outputHash = "01wylp2zv4bxg77jmklz2lfac8hir23vk5aa44r3373kl8i8l7yk"; 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"
'';
}); });
}); });