diff --git a/components/gopkgs.nix b/components/gopkgs.nix index b8f1083..ec8e775 100644 --- a/components/gopkgs.nix +++ b/components/gopkgs.nix @@ -41,7 +41,7 @@ buildGo123Module { "cmd/proxy" "cmd/radius" ]; - vendorHash = "sha256-x5y+3s4PkiE5HieXOHNaMPPvSwhh8gJ73JkfQps1/nU="; + vendorHash = "sha256-FyRTPs2xfostV2x03IjrxEYBSrsZwnuPn+oHyQq1Kq0="; nativeBuildInputs = [ makeWrapper ]; doCheck = false; postInstall = '' diff --git a/flake.lock b/flake.lock index 8f4638c..bbb6b22 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1733849292, - "narHash": "sha256-gJYgrRxytoGHkjeEsiKY/tl06D8XOnZZ9SDpK1WSyUw=", + "lastModified": 1734959339, + "narHash": "sha256-CkUmsVKzAQ/VWIhtxWxlcGtrWVa8hxqsMqvfcsG5ktA=", "owner": "goauthentik", "repo": "authentik", - "rev": "0edd7531a152910e6bdd4f7d3d0cde3ed5fdd956", + "rev": "e87a17fd8169d3fa92bcc47eb2743928df83bc95", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2024.10.5", + "ref": "version/2024.12.1", "repo": "authentik", "type": "github" } @@ -159,11 +159,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1730284601, - "narHash": "sha256-eHYcKVLIRRv3J1vjmxurS6HVdGphB53qxUeAkylYrZY=", + "lastModified": 1735164664, + "narHash": "sha256-DaWy+vo3c4TQ93tfLjUgcpPaSoDw4qV4t76Y3Mhu84I=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "43a898b4d76f7f3f70df77a2cc2d40096bc9d75e", + "rev": "1fb01e90771f762655be7e0e805516cd7fa4d58e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0abfda3..278df4f 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,6 @@ flake = false; }; - # nixos-unstable required for go 1.23, until 24.11 release nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; poetry2nix = { @@ -32,7 +31,7 @@ }; }; 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; }; }; @@ -51,7 +50,7 @@ { inherit inputs; } ({ inputs, lib, withSystem, ... }: 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 { systems = import inputs.systems; flake = { self, ... }: { diff --git a/poetry2nix-python-overrides.nix b/poetry2nix-python-overrides.nix index f51f6bd..02f24d9 100644 --- a/poetry2nix-python-overrides.nix +++ b/poetry2nix-python-overrides.nix @@ -113,21 +113,33 @@ pkgs: final.flit-core ]; }); - python-kadmin = prev.python-kadmin.overrideAttrs (oA: { + python-kadmin-rs = prev.python-kadmin-rs.overrideAttrs (oA: { + pythonImportsCheck = [ "kadmin" ]; nativeBuildInputs = oA.nativeBuildInputs ++ [ + pkgs.rustPlatform.cargoSetupHook + pkgs.rustc + pkgs.cargo final.setuptools - final.poetry-core + final.setuptools-scm + final.setuptools-rust + pkgs.sccache + pkgs.pkg-config + pkgs.rustPlatform.bindgenHook + pkgs.libkrb5 ]; buildInputs = oA.buildInputs ++ [ pkgs.krb5 ]; - pythonImportsCheck = [ "kadmin" ]; + cargoDeps = pkgs.rustPlatform.fetchCargoTarball { + inherit (oA) pname version src; + hash = "sha256-iH2fm4OUwLdx+lqmPNOkzM3LH6gBVYDtZ+livhOQrE4="; + }; }); gssapi = prev.gssapi.overrideAttrs (oA: { nativeBuildInputs = oA.nativeBuildInputs ++ [ final.setuptools final.cython - pkgs.krb5 # needs krb5-config + pkgs.krb5 ]; postPatch = '' substituteInPlace setup.py \ @@ -135,6 +147,10 @@ pkgs: ''; 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; + }); } ) ]