@@ -1,4 +1,9 @@
1−{ pkgs, system ? builtins.currentSystem, ... }: let
1+{ pkgs ? (import ../.. { inherit system; config = { }; })
2+, system ? builtins.currentSystem
3+, ...
4+}:
5+
6+let
27 dbContents = ''
38 dn: dc=example
49 objectClass: domain
@@ -16,7 +21,7 @@
1621 '';
1722in {
1823 # New-style configuration
19− current = import ./make-test-python.nix {
24+ current = import ./make-test-python.nix ({ pkgs, ... }: {
2025 inherit testScript;
2126 name = "openldap";
2227
@@ -53,10 +58,10 @@ in {
5358 declarativeContents."dc=example" = dbContents;
5459 };
5560 };
56− };
61+ }) { inherit pkgs system; };
5762
5863 # Old-style configuration
59− oldOptions = import ./make-test-python.nix {
64+ oldOptions = import ./make-test-python.nix ({ pkgs, ... }: {
6065 inherit testScript;
6166 name = "openldap";
6267
@@ -72,10 +77,10 @@ in {
7277 declarativeContents."dc=example" = dbContents;
7378 };
7479 };
75− };
80+ }) { inherit system pkgs; };
7681
7782 # Manually managed configDir, for example if dynamic config is essential
78− manualConfigDir = import ./make-test-python.nix {
83+ manualConfigDir = import ./make-test-python.nix ({ pkgs, ... }: {
7984 name = "openldap";
8085
8186 machine = { pkgs, ... }: {
@@ -121,5 +126,5 @@ in {
121126 "systemctl restart openldap",
122127 )
123128 '' + testScript;
124− };
129+ }) { inherit system pkgs; };
125130}