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

update: 2024.2.3 -> 2024.4.1

Browse source 
Release notes: https://docs.goauthentik.io/docs/releases/2024.4

Notable dependency updates:
python 3.11 -> python 3.12
golang 1.21 -> golang 1.22
nixpkgs-23.11 -> nixpkgs-unstable (for golang 1.22 until 24.05)

Introduces patch to `web/package-lock.json`, see `components/frontend.nix`,
this will cause IFD until the issue is resolved.
https://nixos.org/manual/nix/stable/language/import-from-derivation

Flake lock file updates:

• Updated input 'authentik-src':
    'github:goauthentik/authentik/6bb180f94ec124092c4f87ae5f5d892a70b32ff3' (2024-04-17)
  → 'github:goauthentik/authentik/ca70c963e55daf73b479a4513da06ac5cea77718' (2024-04-26)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/53a2c32bc66f5ae41a28d7a9a49d321172af621e' (2024-04-15)
  → 'github:NixOS/nixpkgs/6143fc5eeb9c4f00163267708e26191d1e918932' (2024-04-21)
• Updated input 'poetry2nix':
    'github:nix-community/poetry2nix/3c92540611f42d3fb2d0d084a6c694cd6544b609' (2024-02-22)
  → 'github:nix-community/poetry2nix/9245811b58905453033f1ef551f516cbee71c42c' (2024-04-26)
This commit is contained in:
WilliButz 2024-04-24 18:44:40 +02:00
parent 5011f30262
commit 608c5dd4f5
No known key found for this signature in database
GPG key ID: AB05DF703EB9DC70
9 changed files with 129 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

97
poetry2nix-python-overrides.nix
View file

@ -8,77 +8,35 @@ pkgs:
nativeBuildInputs = (oA.nativeBuildInputs or []) ++ [ final.setuptools ];
});
}) [
"bump2version"
"dumb-init"
"opencontainers"
"pytest-github-actions-annotate-failures"
"drf-jsonschema-serializer"
"pydantic-scim"
"django-tenants"
]))
)
(final: prev: {
ruff = null; # don't need a linter for the package %), groups = [] && checkGroups = [] doesn't seem to work
django-otp = prev.django-otp.overrideAttrs (oA: {
buildInputs = [ final.hatchling ];
});
service-identity = prev.service-identity.overrideAttrs (oA: {
buildInputs = [
final.hatchling
final.hatch-fancy-pypi-readme
final.hatch-vcs
];
});
pyrad = prev.pyrad.overrideAttrs (oA: {
nativeBuildInputs = oA.nativeBuildInputs ++ [
final.poetry
];
});
xmlsec = prev.xmlsec.overridePythonAttrs (oA: {
nativeBuildInputs = oA.nativeBuildInputs ++ [ final.setuptools final.pkgconfig ];
buildInputs = [ pkgs.xmlsec.dev pkgs.xmlsec pkgs.libxml2 pkgs.libtool ];
});
opencontainers = prev.opencontainers.overrideAttrs (oA: {
nativeBuildInputs = oA.nativeBuildInputs ++ [
final.setuptools
final.pytest-runner final.pytest
];
});
urllib3-secure-extra = prev.urllib3-secure-extra.overrideAttrs (oA: {
buildInputs = [ final.flit-core ];
});
pydantic-scim = prev.pydantic-scim.overrideAttrs (oA: {
nativeBuildInputs = oA.nativeBuildInputs ++ [
final.setuptools-scm
];
});
psycopg-c = prev.psycopg-c.overrideAttrs (oA: {
nativeBuildInputs = oA.nativeBuildInputs ++ [
final.setuptools
final.tomli
final.cython_3
final.cython-3
pkgs.postgresql
];
});
psycopg = prev.psycopg.overrideAttrs (oA: {
propagatedBuildInputs = oA.propagatedBuildInputs ++ [
final.psycopg-c
];
pythonImportsCheck = [
"psycopg"
"psycopg_c"
];
});
twisted = prev.twisted.overrideAttrs (oA: {
buildInputs = [
buildInputs = oA.buildInputs ++ [
final.hatchling
final.hatch-fancy-pypi-readme
];
});
django-filter = prev.django-filter.overrideAttrs (oA: {
nativeBuildInputs = oA.nativeBuildInputs ++ [
final.flit-core
];
});
cryptography = prev.cryptography.overridePythonAttrs (oA: {
cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
src = oA.src;
@ -87,6 +45,55 @@ pkgs:
sha256 = "sha256-qaXQiF1xZvv4sNIiR2cb5TfD7oNiYdvUwcm37nh2P2M=";
};
});
dnspython = prev.dnspython.overrideAttrs (oA: {
buildInputs = oA.buildInputs ++ [
final.hatchling
];
});
sqlparse = prev.sqlparse.overrideAttrs (oA: {
buildInputs = oA.buildInputs ++ [
final.hatchling
];
});
scim2-filter-parser = prev.scim2-filter-parser.overrideAttrs (oA: {
patches = [
(pkgs.fetchpatch {
name = "replace-poetry-with-poetry-core.patch";
url = "https://patch-diff.githubusercontent.com/raw/15five/scim2-filter-parser/pull/43.patch";
hash = "sha256-PjJH1S5CDe/BMI0+mB34KdpNNcHfexBFYBmHolsWH4o=";
})
];
nativeBuildInputs = oA.nativeBuildInputs ++ [
final.poetry-core
];
});
# alias because lxml references cython_3 in nativeBuildInputs
cython_3 = final.cython-3;
#pyyaml = pkgs.python312.pkgs.pyyaml;
pyyaml = prev.pyyaml.overrideAttrs (oA:
let
# checks if derivation is cython with major version 3
isNotCython3 = drv:
let
drvInfo = builtins.parseDrvName drv.name;
isCython = pkgs.lib.hasSuffix "-cython" drvInfo.name;
isVersion3 = pkgs.lib.versions.major drvInfo.version == "3";
in
isCython -> !isVersion3;
# removes cython3 derivation from list
removeCython3 = builtins.filter isNotCython3;
in
{
# pyyaml 6.0.1 doesn't build with cython3, see upstream nixpkgs
nativeBuildInputs = (removeCython3 oA.nativeBuildInputs) ++ [
pkgs.python312Packages.cython_0
final.setuptools
];
buildInputs = oA.buildInputs ++ [
pkgs.libyaml
];
});
}
)
]