Skip to content

Commit 6da4c7d

Browse files
WilliButzfpletz
andcommitted
update: 2024.10.5 -> 2024.12.1
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 <[email protected]>
1 parent b059e1d commit 6da4c7d

File tree

4 files changed

+30
-15
lines changed

4 files changed

+30
-15
lines changed

components/gopkgs.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ buildGo123Module {
4141
"cmd/proxy"
4242
"cmd/radius"
4343
];
44-
vendorHash = "sha256-x5y+3s4PkiE5HieXOHNaMPPvSwhh8gJ73JkfQps1/nU=";
44+
vendorHash = "sha256-FyRTPs2xfostV2x03IjrxEYBSrsZwnuPn+oHyQq1Kq0=";
4545
nativeBuildInputs = [ makeWrapper ];
4646
doCheck = false;
4747
postInstall = ''

flake.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
flake = false;
1414
};
1515

16-
# nixos-unstable required for go 1.23, until 24.11 release
1716
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
1817

1918
poetry2nix = {
@@ -32,7 +31,7 @@
3231
};
3332
};
3433
authentik-src = { # change version string in outputs as well when updating
35-
url = "github:goauthentik/authentik/version/2024.10.5";
34+
url = "github:goauthentik/authentik/version/2024.12.1";
3635
flake = false;
3736
};
3837
};
@@ -51,7 +50,7 @@
5150
{ inherit inputs; }
5251
({ inputs, lib, withSystem, ... }:
5352
let
54-
authentik-version = "2024.10.5"; # to pass to the drvs of some components
53+
authentik-version = "2024.12.1"; # to pass to the drvs of some components
5554
in {
5655
systems = import inputs.systems;
5756
flake = { self, ... }: {

poetry2nix-python-overrides.nix

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,28 +113,44 @@ pkgs:
113113
final.flit-core
114114
];
115115
});
116-
python-kadmin = prev.python-kadmin.overrideAttrs (oA: {
116+
python-kadmin-rs = prev.python-kadmin-rs.overrideAttrs (oA: {
117+
pythonImportsCheck = [ "kadmin" ];
117118
nativeBuildInputs = oA.nativeBuildInputs ++ [
119+
pkgs.rustPlatform.cargoSetupHook
120+
pkgs.rustc
121+
pkgs.cargo
118122
final.setuptools
119-
final.poetry-core
123+
final.setuptools-scm
124+
final.setuptools-rust
125+
pkgs.sccache
126+
pkgs.pkg-config
127+
pkgs.rustPlatform.bindgenHook
128+
pkgs.libkrb5
120129
];
121130
buildInputs = oA.buildInputs ++ [
122131
pkgs.krb5
123132
];
124-
pythonImportsCheck = [ "kadmin" ];
133+
cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
134+
inherit (oA) pname version src;
135+
hash = "sha256-iH2fm4OUwLdx+lqmPNOkzM3LH6gBVYDtZ+livhOQrE4=";
136+
};
125137
});
126138
gssapi = prev.gssapi.overrideAttrs (oA: {
127139
nativeBuildInputs = oA.nativeBuildInputs ++ [
128140
final.setuptools
129141
final.cython
130-
pkgs.krb5 # needs krb5-config
142+
pkgs.krb5
131143
];
132144
postPatch = ''
133145
substituteInPlace setup.py \
134146
--replace-fail 'get_output(f"{kc} gssapi --prefix")' '"${pkgs.krb5.dev}"'
135147
'';
136148
pythonImportsCheck = [ "gssapi" ];
137149
});
150+
# break dependency cycle that causes an infinite recursion
151+
ua-parser-builtins = prev.ua-parser-builtins.overridePythonAttrs (oA: {
152+
propagatedBuildInputs = builtins.filter (p: p.pname != "ua-parser") oA.propagatedBuildInputs;
153+
});
138154
}
139155
)
140156
]

0 commit comments

Comments
 (0)