commit 42ec4ec905c7bc5244577df8c6d3f31e790ac9cc · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/networking/jibri/default.nix

···

       378
       378
        
               '')

     

       379
       379
        
               cfg.xmppEnvironments))

     

       380
       380
        
             + ''

     

       381
       381
       -
               ${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

     

       381
       381
       +
               ${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

     

       382
       382
        
             '';

     

       383
       383
        
       

     

       384
       384
        
             environment.HOME = "/var/lib/jibri";

-3

nixos/tests/jibri.nix

···

       35
       35
        
           machine.wait_for_unit("jibri.service")

     

       36
       36
        
       

     

       37
       37
        
           machine.wait_until_succeeds(

     

       38
       38
       -
               "journalctl -b -u jitsi-videobridge2 -o cat | grep -q 'Performed a successful health check'", timeout=30

     

       39
       39
       -
           )

     

       40
       40
       -
           machine.wait_until_succeeds(

     

       41
       38
        
               "journalctl -b -u prosody -o cat | grep -q 'Authenticated as focus@auth.machine'", timeout=31

     

       42
       39
        
           )

     

       43
       40
        
           machine.wait_until_succeeds(

+2 -2

pkgs/misc/jitsi-meet-prosody/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "jitsi-meet-prosody";

     

       5
       5
       -
         version = "1.0.6600";

     

       5
       5
       +
         version = "1.0.6644";

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";

     

       8
       8
       -
           sha256 = "SrWkm+dXfBQmI9nownh7fRe6WXrF/x2GP0Guw7GmXOo=";

     

       8
       8
       +
           sha256 = "41jlcsJpcFlNdBIOAdzTUF3wOUAOS9upF/uxFQaGULc=";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         dontBuild = true;

+4 -4

pkgs/servers/jibri/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, dpkg, jre8_headless, makeWrapper, writeText, xorg }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, dpkg, jdk11_headless, makeWrapper, writeText, xorg }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         xorgModulePaths = writeText "module-paths" ''

     
···

       13
       13
        
       in

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "jibri";

     

       16
       16
       -
         version = "8.0-93-g51fe7a2";

     

       16
       16
       +
         version = "8.0-139-g7ab9aa2";

     

       17
       17
        
         src = fetchurl {

     

       18
       18
        
           url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";

     

       19
       19
       -
           sha256 = "8jBSkFIBi7NYxV41VtFmGfevVp6+emRWdoQ1l4dS6PA=";

     

       19
       19
       +
           sha256 = "14V5khp6S9T3SWiNfKyxn2WCzwhcXDCRDtATa15p01M=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         dontBuild = true;

     
···

       32
       32
        
       

     

       33
       33
        
           cat '${xorgModulePaths}' >> $out/etc/jitsi/jibri/xorg-video-dummy.conf

     

       34
       34
        
       

     

       35
       35
       -
           makeWrapper ${jre8_headless}/bin/java $out/bin/jibri --add-flags "-jar $out/opt/jitsi/jibri/jibri.jar"

     

       35
       35
       +
           makeWrapper ${jdk11_headless}/bin/java $out/bin/jibri --add-flags "-jar $out/opt/jitsi/jibri/jibri.jar"

     

       36
       36
        
       

     

       37
       37
        
           runHook postInstall

     

       38
       38
        
         '';

+2 -2

pkgs/servers/jicofo/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         pname = "jicofo";

     

       5
       5
       -
         version = "1.0-934";

     

       5
       5
       +
         version = "1.0-940";

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";

     

       8
       8
       -
           sha256 = "tT1w1OUcsnyQ5/pkborFkdOq0CEge6qtNLJrJgWIwjo=";

     

       8
       8
       +
           sha256 = "vx7aUHfKxG+tZ0sM8eWr1tTKf//bMxdKVhE5I4P4mLo=";

     

       9
       9
        
         };

     

       10
       10
        
       in

     

       11
       11
        
       stdenv.mkDerivation {

+2 -2

pkgs/servers/jitsi-videobridge/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         pname = "jitsi-videobridge2";

     

       5
       5
       -
         version = "2.2-22-g42bc1b99";

     

       5
       5
       +
         version = "2.2-45-ge8b20f06";

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";

     

       8
       8
       -
           sha256 = "ZiIeD5NXHMurcoyVnD8RCGuOKRiUDU1AMH57A0s4tAs=";

     

       8
       8
       +
           sha256 = "fbSpjLdx9xbLdp7vzHTW9B/cDf3DahpwuI4IcqEqpas=";

     

       9
       9
        
         };

     

       10
       10
        
       in

     

       11
       11
        
       stdenv.mkDerivation {

+2 -2

pkgs/servers/web-apps/jitsi-meet/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "jitsi-meet";

     

       5
       5
       -
         version = "1.0.6600";

     

       5
       5
       +
         version = "1.0.6644";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2";

     

       9
       9
       -
           sha256 = "KrmpEGMLTy9p/MGgFKR+NGhryjwp3W95gIQrOYm3iTI=";

     

       9
       9
       +
           sha256 = "y1oI3nxIu7breYNPhdX7PU5GfnCyxdEbAYlyZmif2Uo=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         dontBuild = true;