From c23b26e93eb86808ca17a2974eca2d701cb05ed4 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Wed, 10 May 2023 20:35:21 +0200 Subject: [PATCH 1/2] coturn: 4.6.1 -> 4.6.2 --- pkgs/servers/coturn/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index f73a6a6f633e..d23c39355e1b 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "coturn"; - version = "4.6.1"; + version = "4.6.2"; src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; rev = "refs/tags/${version}"; - hash = "sha256-ckqPxG3ieqA0H9g1GfE8hYs6tUsZfzt6/yYR1qlgoxE="; + hash = "sha256-BKIto762W7UkKjzIm3eVU18oiHpYUMQYJihebYxBOZs="; }; nativeBuildInputs = [ @@ -38,12 +38,6 @@ stdenv.mkDerivation rec { patches = [ ./pure-configure.patch - - # fix build against openssl 3.x - (fetchpatch { - url = "https://github.com/coturn/coturn/commit/4ce784a8781ab086c150e2b9f5641b1a37fd9b31.patch"; - hash = "sha256-Jx8XNXrgq0ockm1zjwRzfvSS3fVrVyVvQY1l0CpcR3Q="; - }) ]; # Workaround build failure on -fno-common toolchains like upstream From 144ef637a6c989943d81eddc2da5090a10514590 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Tue, 13 Jun 2023 22:48:29 +0200 Subject: [PATCH 2/2] nixosTests.coturn: wait_for_open_port --- nixos/tests/coturn.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/coturn.nix b/nixos/tests/coturn.nix index 301b34b0da70..b44bf8d06e39 100644 --- a/nixos/tests/coturn.nix +++ b/nixos/tests/coturn.nix @@ -24,6 +24,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { with subtest("works with static-auth-secret-file"): secretsfile.wait_for_unit("coturn.service") + secretsfile.wait_for_open_port(3478) secretsfile.succeed("grep 'some-very-secret-string' /run/coturn/turnserver.cfg") # Forbidden IP, fails: secretsfile.fail("${pkgs.coturn}/bin/turnutils_uclient -W some-very-secret-string 127.0.0.1 -DgX -e 127.0.0.1 -n 1 -c -y")