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

update: 2024.10.5 -> 2024.12.1

Browse source 
See https://docs.goauthentik.io/docs/releases/2024.12

guess we're doing rust now

Flake lock file updates:

• Updated input 'authentik-src':
    'github:goauthentik/authentik/0edd7531a152910e6bdd4f7d3d0cde3ed5fdd956' (2024-12-10)
  → 'github:goauthentik/authentik/e87a17fd8169d3fa92bcc47eb2743928df83bc95' (2024-12-23)
• Updated input 'poetry2nix':
    'github:nix-community/poetry2nix/43a898b4d76f7f3f70df77a2cc2d40096bc9d75e' (2024-10-30)
  → 'github:nix-community/poetry2nix/1fb01e90771f762655be7e0e805516cd7fa4d58e' (2024-12-25)

Co-authored-by: Franz Pletz <fpletz@fnordicwalking.de>
This commit is contained in:
WilliButz 2025-01-04 16:19:54 +01:00
parent b059e1d6e7
commit 6da4c7da80
No known key found for this signature in database
GPG key ID: AB05DF703EB9DC70
4 changed files with 30 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/gopkgs.nix
View file

@ -41,7 +41,7 @@ buildGo123Module {
"cmd/proxy" "cmd/proxy"
"cmd/radius" "cmd/radius"
]; ];
vendorHash = "sha256-x5y+3s4PkiE5HieXOHNaMPPvSwhh8gJ73JkfQps1/nU="; vendorHash = "sha256-FyRTPs2xfostV2x03IjrxEYBSrsZwnuPn+oHyQq1Kq0=";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
doCheck = false; doCheck = false;
postInstall = '' postInstall = ''

14
flake.lock generated
View file

@ -3,16 +3,16 @@
"authentik-src": { "authentik-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733849292, "lastModified": 1734959339,
"narHash": "sha256-gJYgrRxytoGHkjeEsiKY/tl06D8XOnZZ9SDpK1WSyUw=", "narHash": "sha256-CkUmsVKzAQ/VWIhtxWxlcGtrWVa8hxqsMqvfcsG5ktA=",
"owner": "goauthentik", "owner": "goauthentik",
"repo": "authentik", "repo": "authentik",
"rev": "0edd7531a152910e6bdd4f7d3d0cde3ed5fdd956", "rev": "e87a17fd8169d3fa92bcc47eb2743928df83bc95",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "goauthentik", "owner": "goauthentik",
"ref": "version/2024.10.5", "ref": "version/2024.12.1",
"repo": "authentik", "repo": "authentik",
"type": "github" "type": "github"
} }
@ -159,11 +159,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1730284601, "lastModified": 1735164664,
"narHash": "sha256-eHYcKVLIRRv3J1vjmxurS6HVdGphB53qxUeAkylYrZY=", "narHash": "sha256-DaWy+vo3c4TQ93tfLjUgcpPaSoDw4qV4t76Y3Mhu84I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "poetry2nix", "repo": "poetry2nix",
"rev": "43a898b4d76f7f3f70df77a2cc2d40096bc9d75e", "rev": "1fb01e90771f762655be7e0e805516cd7fa4d58e",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -13,7 +13,6 @@
flake = false; flake = false;
}; };
# nixos-unstable required for go 1.23, until 24.11 release
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
poetry2nix = { poetry2nix = {
@ -32,7 +31,7 @@
}; };
}; };
authentik-src = { # change version string in outputs as well when updating authentik-src = { # change version string in outputs as well when updating
url = "github:goauthentik/authentik/version/2024.10.5"; url = "github:goauthentik/authentik/version/2024.12.1";
flake = false; flake = false;
}; };
}; };
@ -51,7 +50,7 @@
{ inherit inputs; } { inherit inputs; }
({ inputs, lib, withSystem, ... }: ({ inputs, lib, withSystem, ... }:
let let
authentik-version = "2024.10.5"; # to pass to the drvs of some components authentik-version = "2024.12.1"; # to pass to the drvs of some components
in { in {
systems = import inputs.systems; systems = import inputs.systems;
flake = { self, ... }: { flake = { self, ... }: {

24
poetry2nix-python-overrides.nix
View file

@ -113,21 +113,33 @@ pkgs:
final.flit-core final.flit-core
]; ];
}); });
python-kadmin = prev.python-kadmin.overrideAttrs (oA: { python-kadmin-rs = prev.python-kadmin-rs.overrideAttrs (oA: {
pythonImportsCheck = [ "kadmin" ];
nativeBuildInputs = oA.nativeBuildInputs ++ [ nativeBuildInputs = oA.nativeBuildInputs ++ [
pkgs.rustPlatform.cargoSetupHook
pkgs.rustc
pkgs.cargo
final.setuptools final.setuptools
final.poetry-core final.setuptools-scm
final.setuptools-rust
pkgs.sccache
pkgs.pkg-config
pkgs.rustPlatform.bindgenHook
pkgs.libkrb5
]; ];
buildInputs = oA.buildInputs ++ [ buildInputs = oA.buildInputs ++ [
pkgs.krb5 pkgs.krb5
]; ];
pythonImportsCheck = [ "kadmin" ]; cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
inherit (oA) pname version src;
hash = "sha256-iH2fm4OUwLdx+lqmPNOkzM3LH6gBVYDtZ+livhOQrE4=";
};
}); });
gssapi = prev.gssapi.overrideAttrs (oA: { gssapi = prev.gssapi.overrideAttrs (oA: {
nativeBuildInputs = oA.nativeBuildInputs ++ [ nativeBuildInputs = oA.nativeBuildInputs ++ [
final.setuptools final.setuptools
final.cython final.cython
pkgs.krb5 # needs krb5-config pkgs.krb5
]; ];
postPatch = '' postPatch = ''
substituteInPlace setup.py \ substituteInPlace setup.py \
@ -135,6 +147,10 @@ pkgs:
''; '';
pythonImportsCheck = [ "gssapi" ]; pythonImportsCheck = [ "gssapi" ];
}); });
# break dependency cycle that causes an infinite recursion
ua-parser-builtins = prev.ua-parser-builtins.overridePythonAttrs (oA: {
propagatedBuildInputs = builtins.filter (p: p.pname != "ua-parser") oA.propagatedBuildInputs;
});
} }
) )
] ]