cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #231148 from 0x4A6F/master-coturn

Browse source 
coturn: 4.6.1 -> 4.6.2
This commit is contained in:
ajs124 2023-06-14 14:54:39 +02:00 committed by GitHub
commit 85fe3cded5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/tests/coturn.nix
View file

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

10
pkgs/servers/coturn/default.nix
View file

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