Merge master into staging-next

2021-02-13 18:15:59 +00:00
parent 257f90a43f d933d28a57
commit 1c7975a26f
30 changed files with 1641 additions and 958 deletions
@@ -1,19 +1,21 @@
-{ pkgs, lib, stdenv, fetchurl, nixosTests }:
+{ lib, stdenv, fetchurl, nixosTests }:

 stdenv.mkDerivation rec {
  pname = "jitsi-meet";
-  version = "1.0.4289";
+  version = "1.0.4628";

  src = fetchurl {
    url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2";
-    sha256 = "0hs6hjcb0cxmakx2na3xkz9bld0xcil5slp4wjl5xql3s00mk10v";
+    sha256 = "1kw4byy6mvqk3qd5nk5raka1bl9jp0kniszq6j5kc8nz3jql4qdz";
  };

  dontBuild = true;

  installPhase = ''
+    runHook preInstall
    mkdir $out
    mv * $out/
+    runHook postInstall
  '';

  passthru.tests = {