movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-01-15 06:40:38 +00:00 • committed by GitHub
commit 83c50873f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 170 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/databases/redis.nix
View file

@ -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

2
nixos/tests/docker-tools.nix
View file

@ -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(

2
nixos/tests/docker.nix
View file

@ -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"