diff --git a/flake.lock b/flake.lock index bcee9bd..88fd42c 100644 --- a/flake.lock +++ b/flake.lock @@ -47,9 +47,7 @@ "flake-parts": "flake-parts", "flake-utils": "flake-utils", "napalm": "napalm", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "pyproject-build-systems": "pyproject-build-systems", "pyproject-nix": "pyproject-nix", "systems": "systems_2", @@ -72,16 +70,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1770986320, - "narHash": "sha256-6w1OFrOK/l/cPiqEBZ5w89R1648IUmOyvLIIrEQEm+I=", + "lastModified": 1770911230, + "narHash": "sha256-alTyrMBbjZbw4jhEna8saabf93sqSrZCu+Z5xH3pZ7M=", "owner": "goauthentik", "repo": "authentik", - "rev": "06b3d71c6994c25a18df4c34f2f142bec2c34d25", + "rev": "19ad8d3ae3f266ec1096bc4461fdf6bcda1aa079", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version-2025.10", + "ref": "version/2025.12.4", "repo": "authentik", "type": "github" } @@ -393,16 +391,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770770419, - "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -438,6 +436,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1770770419, + "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, "pyproject-build-systems": { "inputs": { "nixpkgs": [ @@ -496,7 +510,7 @@ "home-manager": "home-manager_2", "lix-module": "lix-module", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable" } }, diff --git a/flake.nix b/flake.nix index e91ad89..f52872c 100644 --- a/flake.nix +++ b/flake.nix @@ -38,10 +38,6 @@ authentik-nix = { url = "github:nix-community/authentik-nix"; - - # Waiting for PR https://github.com/nix-community/authentik-nix/pull/86 - inputs.nixpkgs.follows = "nixpkgs"; - inputs.authentik-src.url = "github:goauthentik/authentik/version-2025.10"; }; }; diff --git a/modules/services/authentik.nix b/modules/services/authentik.nix index 883bf3d..c2e3899 100644 --- a/modules/services/authentik.nix +++ b/modules/services/authentik.nix @@ -93,28 +93,8 @@ in services.authentik = # Waiting for PR https://github.com/nix-community/authentik-nix/pull/86 - let - customAuthentikScope = authentik-nix.lib.mkAuthentikScope { - inherit pkgs; - }; - - # Override the scope to change gopkgs - overriddenScope = customAuthentikScope.overrideScope ( - final: prev: { - authentikComponents = prev.authentikComponents // { - gopkgs = prev.authentikComponents.gopkgs.override { - buildGo125Module = pkgs.buildGo125Module; - }; - }; - } - ); - in { enable = true; - - # Waiting for PR https://github.com/nix-community/authentik-nix/pull/86 - inherit (overriddenScope) authentikComponents; - environmentFile = cfg.envFile; settings = { email = cfg.email;