diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-15 06:40:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-15 06:40:38 +0000 |
| commit | 83c50873f5810152bf1aad2b9a97a225926d04cf (patch) | |
| tree | 60fe684b418785acfba20e8475c325cfb687c3b3 /nixos | |
| parent | 9f69dadafd02400c157f7faf5f594a023b0009ac (diff) | |
| parent | 5fae0b941aed842791ea74092c71a88c940bb42c (diff) | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/databases/redis.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/docker-tools.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/docker.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 1b90e59b1663..117e63662258 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -144,7 +144,7 @@ in }; masterAuth = mkOption { - type = types.str; + type = with types; nullOr str; default = null; description = ''If the master is password protected (using the requirePass configuration) it is possible to tell the slave to authenticate before starting the replication synchronization diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 6638ec4927ce..e2bd9ddf6470 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -18,7 +18,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { testScript = with pkgs.dockerTools; '' unix_time_second1 = "1970-01-01T00:00:01Z" - docker.wait_for_unit("sockets.target") + docker.wait_for_unit("docker.service") with subtest("Ensure Docker images use a stable date by default"): docker.succeed( diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index 58e33535ed31..a0f328af775c 100644 --- a/nixos/tests/docker.nix +++ b/nixos/tests/docker.nix @@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { testScript = '' start_all() - docker.wait_for_unit("sockets.target") + docker.wait_for_unit("docker.service") docker.succeed("tar cv --files-from /dev/null | docker import - scratchimg") docker.succeed( "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" |