diff --git a/components/gopkgs.nix b/components/gopkgs.nix index d3771fc..7230568 100644 --- a/components/gopkgs.nix +++ b/components/gopkgs.nix @@ -42,7 +42,7 @@ buildGo123Module { "cmd/proxy" "cmd/radius" ]; - vendorHash = "sha256-FyRTPs2xfostV2x03IjrxEYBSrsZwnuPn+oHyQq1Kq0="; + vendorHash = "sha256-aG/VqpmHJeGyF98aS0jgwEAq1R5c8VggeJxLWS9W8HY="; nativeBuildInputs = [ makeWrapper ]; doCheck = false; postInstall = '' diff --git a/flake.lock b/flake.lock index bcd5581..ab40686 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1738183650, - "narHash": "sha256-4XdYlqfd23TVPaJ0R5tEBIpDXLV4mFHdXhIWp5dIvIE=", + "lastModified": 1740398117, + "narHash": "sha256-eafk3lCFG3l1OKt8xoKZjbDFcOUFQgpivMMT4GjaNWU=", "owner": "goauthentik", "repo": "authentik", - "rev": "f1b7a9f934e6b58a1884ba753575eac6267f4b6e", + "rev": "5c5cc1c7daa4248c5a2c29ac47f3639d4eaa8ff5", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2024.12.3", + "ref": "version/2025.2.0", "repo": "authentik", "type": "github" } @@ -159,11 +159,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738741221, - "narHash": "sha256-UiTOA89yQV5YNlO1ZAp4IqJUGWOnTyBC83netvt8rQE=", + "lastModified": 1739883580, + "narHash": "sha256-3ydikhrNaWy8j0cqHju/94PcD4GZ9T4Ju4rHh34oz3k=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "be1fe795035d3d36359ca9135b26dcc5321b31fb", + "rev": "d90f9db68a4bda31c346be16dfd8d3263be4547e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2a1ac10..d9d160b 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,7 @@ }; authentik-src = { # change version string in outputs as well when updating - url = "github:goauthentik/authentik/version/2024.12.3"; + url = "github:goauthentik/authentik/version/2025.2.0"; flake = false; }; }; @@ -56,7 +56,7 @@ ... }: let - authentik-version = "2024.12.3"; # to pass to the drvs of some components + authentik-version = "2025.2.0"; # to pass to the drvs of some components in { systems = import inputs.systems; diff --git a/poetry2nix-python-overrides.nix b/poetry2nix-python-overrides.nix index 898bf09..adea843 100644 --- a/poetry2nix-python-overrides.nix +++ b/poetry2nix-python-overrides.nix @@ -130,23 +130,23 @@ pkgs: [ python-kadmin-rs = prev.python-kadmin-rs.overrideAttrs (oA: { pythonImportsCheck = [ "kadmin" ]; nativeBuildInputs = oA.nativeBuildInputs ++ [ - pkgs.rustPlatform.cargoSetupHook - pkgs.rustc - pkgs.cargo final.setuptools - final.setuptools-scm final.setuptools-rust - pkgs.sccache + final.setuptools-scm + pkgs.cargo + pkgs.libkrb5 pkgs.pkg-config pkgs.rustPlatform.bindgenHook - pkgs.libkrb5 + pkgs.rustPlatform.cargoSetupHook + pkgs.rustc + pkgs.sccache ]; buildInputs = oA.buildInputs ++ [ pkgs.krb5 ]; cargoDeps = pkgs.rustPlatform.fetchCargoVendor { inherit (oA) pname version src; - hash = "sha256-1J2aaEj/G7TE+EptWNwb5Vj048W6DOJNUBWPd9F4DqU="; + hash = "sha256-9LCtsX3fuRXCHu5Gd+7OB5JQZ0h6KjSOSan83KUivLQ="; }; }); gssapi = prev.gssapi.overrideAttrs (oA: { @@ -177,5 +177,33 @@ pkgs: [ hash = "sha256-EuH6svw8eOEpLJYLx+4RFUTTClqfPN07Vc0cjlWoCXw="; }; }); + microsoft-kiota-abstractions = prev.microsoft-kiota-abstractions.overridePythonAttrs (oA: { + nativeBuildInputs = oA.nativeBuildInputs ++ [ final.poetry-core ]; + pythonImportsCheck = [ "kiota_abstractions" ]; + }); + microsoft-kiota-serialization-form = prev.microsoft-kiota-serialization-form.overridePythonAttrs (oA: { + nativeBuildInputs = oA.nativeBuildInputs ++ [ final.poetry-core ]; + pythonImportsCheck = [ "kiota_serialization_form" ]; + }); + microsoft-kiota-serialization-text = prev.microsoft-kiota-serialization-text.overridePythonAttrs (oA: { + nativeBuildInputs = oA.nativeBuildInputs ++ [ final.poetry-core ]; + pythonImportsCheck = [ "kiota_serialization_text" ]; + }); + microsoft-kiota-serialization-json = prev.microsoft-kiota-serialization-json.overridePythonAttrs (oA: { + nativeBuildInputs = oA.nativeBuildInputs ++ [ final.poetry-core ]; + pythonImportsCheck = [ "kiota_serialization_json" ]; + }); + microsoft-kiota-serialization-multipart = prev.microsoft-kiota-serialization-multipart.overridePythonAttrs (oA: { + nativeBuildInputs = oA.nativeBuildInputs ++ [ final.poetry-core ]; + pythonImportsCheck = [ "kiota_serialization_multipart" ]; + }); + microsoft-kiota-http = prev.microsoft-kiota-http.overridePythonAttrs (oA: { + nativeBuildInputs = oA.nativeBuildInputs ++ [ final.poetry-core ]; + pythonImportsCheck = [ "kiota_http" ]; + }); + microsoft-kiota-authentication-azure = prev.microsoft-kiota-authentication-azure.overridePythonAttrs (oA: { + nativeBuildInputs = oA.nativeBuildInputs ++ [ final.poetry-core ]; + pythonImportsCheck = [ "kiota_authentication_azure" ]; + }); }) ]