diff --git a/components/gopkgs.nix b/components/gopkgs.nix index 3baf3cd..ea12d15 100644 --- a/components/gopkgs.nix +++ b/components/gopkgs.nix @@ -41,7 +41,7 @@ buildGo121Module { "cmd/proxy" "cmd/radius" ]; - vendorHash = "sha256-74rSuZrO5c7mjhHh0iQlJEkOslsFrcDb1aRXXC4RsUM="; + vendorHash = "sha256-UIJBCTq7AJGUDIlZtJaWCovyxlMPzj2BCJQqthybEz4="; nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/server --prefix PATH : ${authentikComponents.pythonEnv}/bin diff --git a/flake.lock b/flake.lock index e0b66be..845cf05 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1706546688, - "narHash": "sha256-+1IdXRt28UZ2KTa0zsmjneNUOcutP99UUwqcYyVyqTI=", + "lastModified": 1708526096, + "narHash": "sha256-jbU3k+EOp6De7UxNswW7ozAf11iD8XakKMUUjN9Ybz0=", "owner": "goauthentik", "repo": "authentik", - "rev": "e095e9f694d2a427940bc8616bc4025fef502a8b", + "rev": "310983a4d027174afe40e6db908cdfdebf1182b8", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2023.10.7", + "ref": "version/2024.2.0", "repo": "authentik", "type": "github" } @@ -176,11 +176,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1707195113, - "narHash": "sha256-xPFxTMe4rKE/ZWLlOWv22qpGwpozpR+U1zhyf1040Zk=", + "lastModified": 1708175019, + "narHash": "sha256-B7wY2pNrLc3X9uYRo1LUmVzI6oH6fX8oi+96GdUpayU=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "4eb2ac54029af42a001c9901194e9ce19cbd8a40", + "rev": "403d923ea8e2e6cedce3a0f04a9394c4244cb806", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index dde0370..feec643 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,7 @@ }; }; authentik-src = { # change version string in outputs as well when updating - url = "github:goauthentik/authentik/version/2023.10.7"; + url = "github:goauthentik/authentik/version/2024.2.0"; flake = false; }; }; @@ -47,7 +47,7 @@ { inherit inputs; } ({ inputs, lib, withSystem, ... }: let - authentik-version = "2023.10.7"; # to pass to the drvs of some components + authentik-version = "2024.2.0"; # to pass to the drvs of some components in { systems = [ "x86_64-linux" diff --git a/poetry2nix-python-overrides.nix b/poetry2nix-python-overrides.nix index 685f669..736aa37 100644 --- a/poetry2nix-python-overrides.nix +++ b/poetry2nix-python-overrides.nix @@ -14,6 +14,7 @@ pkgs: "pytest-github-actions-annotate-failures" "drf-jsonschema-serializer" "pydantic-scim" + "django-tenants" ])) ) (final: prev: { @@ -78,6 +79,14 @@ pkgs: final.flit-core ]; }); + cryptography = prev.cryptography.overridePythonAttrs (oA: { + cargoDeps = pkgs.rustPlatform.fetchCargoTarball { + src = oA.src; + sourceRoot = "${oA.pname}-${oA.version}/src/rust"; + name = "${oA.pname}-${oA.version}"; + sha256 = "sha256-h6TjGcn81TSQuu+16ty60e6P07uH2gXa3VmG+Vy3eu0="; + }; + }); } ) ]