diff --git a/components/default.nix b/components/default.nix index a31301c..3157faa 100644 --- a/components/default.nix +++ b/components/default.nix @@ -1,36 +1,25 @@ -{ authentik-src -, authentik-version -, authentikPoetryOverrides -, buildNapalmPackage -, defaultPoetryOverrides -, mkPoetryEnv -, pkgs +{ + authentik-src, + authentik-version, + authentikPoetryOverrides, + buildNapalmPackage, + defaultPoetryOverrides, + mkPoetryEnv, + pkgs, }: -pkgs.lib.makeScope pkgs.newScope (final: +pkgs.lib.makeScope pkgs.newScope ( + final: let - docs = final.callPackage ./docs.nix { - inherit authentik-src authentik-version buildNapalmPackage; - }; - frontend = final.callPackage ./frontend.nix { - inherit authentik-src authentik-version buildNapalmPackage; - }; - pythonEnv = final.callPackage ./pythonEnv.nix { - inherit authentik-src mkPoetryEnv defaultPoetryOverrides authentikPoetryOverrides; - }; + docs = final.callPackage ./docs.nix { }; + frontend = final.callPackage ./frontend.nix { }; + pythonEnv = final.callPackage ./pythonEnv.nix { }; # server + outposts - gopkgs = final.callPackage ./gopkgs.nix { - inherit authentik-src authentik-version; - }; - staticWorkdirDeps = final.callPackage ./staticWorkdirDeps.nix { - inherit authentik-src; - }; - migrate = final.callPackage ./migrate.nix { - inherit authentik-src; - }; + gopkgs = final.callPackage ./gopkgs.nix { }; + staticWorkdirDeps = final.callPackage ./staticWorkdirDeps.nix { }; + migrate = final.callPackage ./migrate.nix { }; # worker - manage = final.callPackage ./manage.nix { - }; + manage = final.callPackage ./manage.nix { }; in { authentikComponents = { @@ -41,8 +30,16 @@ pkgs.lib.makeScope pkgs.newScope (final: gopkgs staticWorkdirDeps migrate - manage; + manage + ; }; - inherit authentik-src authentik-version; + inherit + authentik-src + authentik-version + buildNapalmPackage + mkPoetryEnv + defaultPoetryOverrides + authentikPoetryOverrides + ; } ) diff --git a/flake.nix b/flake.nix index 9afbe2d..0fe8d80 100644 --- a/flake.nix +++ b/flake.nix @@ -119,11 +119,11 @@ inherit pkgs authentik-version; inherit (self) nixosModules; }); - # override-scope = (import tests/override-scope.nix { - # inherit pkgs authentik-version; - # inherit (self) nixosModules; - # inherit (self.lib) mkAuthentikScope; - # }); + override-scope = (import tests/override-scope.nix { + inherit pkgs authentik-version; + inherit (self) nixosModules; + inherit (self.lib) mkAuthentikScope; + }); }; }; }); diff --git a/tests/override-scope.nix b/tests/override-scope.nix index d5469fd..ab86738 100644 --- a/tests/override-scope.nix +++ b/tests/override-scope.nix @@ -115,7 +115,9 @@ pkgs.nixosTest { machine.screenshot("3_rendered_admin_interface") machine.succeed("su - alice -c 'xdotool click 1' >&2") machine.succeed("su - alice -c 'xdotool key --delay 100 Page_Down' >&2") - machine.wait_for_text("${authentik-version}") + # sometimes the cursor covers the version string + machine.succeed("su - alice -c 'xdotool mousemove_relative 50 50' >&2") + machine.wait_for_text("${builtins.replaceStrings ["."] [".?"] authentik-version}") machine.screenshot("4_correct_version_in_admin_interface") with subtest("nginx proxies to authentik"):