From 2ef91019dbaa473ba85ffae33f4a7670624f3111 Mon Sep 17 00:00:00 2001 From: Cleeyv Date: Fri, 28 Oct 2022 11:42:55 -0400 Subject: [PATCH 1/6] jibri: 8.0-93 -> 8.0-139 - Fix of accidental downgrade in #158911 - Update of runtime from Java 8 -> 11 --- nixos/modules/services/networking/jibri/default.nix | 2 +- pkgs/servers/jibri/default.nix | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/jibri/default.nix b/nixos/modules/services/networking/jibri/default.nix index 6925ac55840e..a931831fc281 100644 --- a/nixos/modules/services/networking/jibri/default.nix +++ b/nixos/modules/services/networking/jibri/default.nix @@ -378,7 +378,7 @@ in '') cfg.xmppEnvironments)) + '' - ${pkgs.jre8_headless}/bin/java -Djava.util.logging.config.file=${./logging.properties-journal} -Dconfig.file=${configFile} -jar ${pkgs.jibri}/opt/jitsi/jibri/jibri.jar --config /var/lib/jibri/jibri.json + ${pkgs.jdk11_headless}/bin/java -Djava.util.logging.config.file=${./logging.properties-journal} -Dconfig.file=${configFile} -jar ${pkgs.jibri}/opt/jitsi/jibri/jibri.jar --config /var/lib/jibri/jibri.json ''; environment.HOME = "/var/lib/jibri"; diff --git a/pkgs/servers/jibri/default.nix b/pkgs/servers/jibri/default.nix index 121372ec2fc4..be312614af98 100644 --- a/pkgs/servers/jibri/default.nix +++ b/pkgs/servers/jibri/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, dpkg, jre8_headless, makeWrapper, writeText, xorg }: +{ lib, stdenv, fetchurl, dpkg, jdk11_headless, makeWrapper, writeText, xorg }: let xorgModulePaths = writeText "module-paths" '' @@ -13,10 +13,10 @@ let in stdenv.mkDerivation rec { pname = "jibri"; - version = "8.0-93-g51fe7a2"; + version = "8.0-139-g7ab9aa2"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "8jBSkFIBi7NYxV41VtFmGfevVp6+emRWdoQ1l4dS6PA="; + sha256 = "14V5khp6S9T3SWiNfKyxn2WCzwhcXDCRDtATa15p01M="; }; dontBuild = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { cat '${xorgModulePaths}' >> $out/etc/jitsi/jibri/xorg-video-dummy.conf - makeWrapper ${jre8_headless}/bin/java $out/bin/jibri --add-flags "-jar $out/opt/jitsi/jibri/jibri.jar" + makeWrapper ${jdk11_headless}/bin/java $out/bin/jibri --add-flags "-jar $out/opt/jitsi/jibri/jibri.jar" runHook postInstall ''; From d451a6ef0cf16a423324cf3e09f9e115abf0168d Mon Sep 17 00:00:00 2001 From: Cleeyv Date: Fri, 28 Oct 2022 11:50:17 -0400 Subject: [PATCH 2/6] jitsi-meet-prosody: 1.0.6600 -> 1.0.6644 --- pkgs/misc/jitsi-meet-prosody/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/misc/jitsi-meet-prosody/default.nix index abe7281c9d14..f8e57cf12a36 100644 --- a/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/pkgs/misc/jitsi-meet-prosody/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.6600"; + version = "1.0.6644"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "SrWkm+dXfBQmI9nownh7fRe6WXrF/x2GP0Guw7GmXOo="; + sha256 = "41jlcsJpcFlNdBIOAdzTUF3wOUAOS9upF/uxFQaGULc="; }; dontBuild = true; From 01a30d531ba0f6fe5560ab15c3aae510bff169be Mon Sep 17 00:00:00 2001 From: Cleeyv Date: Fri, 28 Oct 2022 11:51:24 -0400 Subject: [PATCH 3/6] jicofo: 1.0-934 -> 1.0-940 --- pkgs/servers/jicofo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jicofo/default.nix b/pkgs/servers/jicofo/default.nix index ae80a2342df1..315d95e1f158 100644 --- a/pkgs/servers/jicofo/default.nix +++ b/pkgs/servers/jicofo/default.nix @@ -2,10 +2,10 @@ let pname = "jicofo"; - version = "1.0-934"; + version = "1.0-940"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "tT1w1OUcsnyQ5/pkborFkdOq0CEge6qtNLJrJgWIwjo="; + sha256 = "vx7aUHfKxG+tZ0sM8eWr1tTKf//bMxdKVhE5I4P4mLo="; }; in stdenv.mkDerivation { From 1483e9a2a5309056df4d2b2262bbd7139fe5f478 Mon Sep 17 00:00:00 2001 From: Cleeyv Date: Fri, 28 Oct 2022 11:53:18 -0400 Subject: [PATCH 4/6] jitsi-videobridge: 2.2-22 -> 2.2-45 --- pkgs/servers/jitsi-videobridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix index 53db8b7303a8..d1041f6bc936 100644 --- a/pkgs/servers/jitsi-videobridge/default.nix +++ b/pkgs/servers/jitsi-videobridge/default.nix @@ -2,10 +2,10 @@ let pname = "jitsi-videobridge2"; - version = "2.2-22-g42bc1b99"; + version = "2.2-45-ge8b20f06"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "ZiIeD5NXHMurcoyVnD8RCGuOKRiUDU1AMH57A0s4tAs="; + sha256 = "fbSpjLdx9xbLdp7vzHTW9B/cDf3DahpwuI4IcqEqpas="; }; in stdenv.mkDerivation { From e71879ae975a0a9b7815af44a688fcff75edf199 Mon Sep 17 00:00:00 2001 From: Cleeyv Date: Fri, 28 Oct 2022 11:56:53 -0400 Subject: [PATCH 5/6] jitsi-meet: 1.0.6600 -> 1.0.6644 --- pkgs/servers/web-apps/jitsi-meet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/servers/web-apps/jitsi-meet/default.nix index 133fa4801dbc..6ea75ee7a9c0 100644 --- a/pkgs/servers/web-apps/jitsi-meet/default.nix +++ b/pkgs/servers/web-apps/jitsi-meet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet"; - version = "1.0.6600"; + version = "1.0.6644"; src = fetchurl { url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; - sha256 = "KrmpEGMLTy9p/MGgFKR+NGhryjwp3W95gIQrOYm3iTI="; + sha256 = "y1oI3nxIu7breYNPhdX7PU5GfnCyxdEbAYlyZmif2Uo="; }; dontBuild = true; From 6873292f43bf55e77d0f1a522c0f83d1fc6b462b Mon Sep 17 00:00:00 2001 From: Cleeyv Date: Thu, 3 Nov 2022 17:00:45 -0400 Subject: [PATCH 6/6] nixos/tests/jibri: remove grep for obsolete videobridge health check As already fixed earlier this year in the jitsi-meet test by @ajs124 https://github.com/NixOS/nixpkgs/commit/729764a32d6569e692e44620bd98b552a9f72c33 --- nixos/tests/jibri.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/tests/jibri.nix b/nixos/tests/jibri.nix index 223120cdb229..45e30af9a9a5 100644 --- a/nixos/tests/jibri.nix +++ b/nixos/tests/jibri.nix @@ -34,9 +34,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.wait_for_unit("prosody.service") machine.wait_for_unit("jibri.service") - machine.wait_until_succeeds( - "journalctl -b -u jitsi-videobridge2 -o cat | grep -q 'Performed a successful health check'", timeout=30 - ) machine.wait_until_succeeds( "journalctl -b -u prosody -o cat | grep -q 'Authenticated as focus@auth.machine'", timeout=31 )