From 89fc4a5ea622f69e204285b78ff5d2c558535c7f Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Sat, 22 May 2021 12:52:59 +0200 Subject: [PATCH 01/22] Update version number, invalidate shas --- .../tools/continuous-integration/drone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index a2bc47b6408b..6f003005c639 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -3,9 +3,9 @@ buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; - version = "1.10.0"; + version = "2.0.0"; - vendorSha256 = "sha256-cKHX/GnvGELQBfoo0/1UmDQ4Z66GGnnHG7+1CzjinL0="; + vendorSha256 = "sha256-cKHX/GnvGELQBfoi0/1UmDQ4Z66GGnnHG7+1CzjinL0="; doCheck = false; @@ -13,7 +13,7 @@ buildGoModule rec { owner = "drone"; repo = "drone"; rev = "v${version}"; - sha256 = "sha256-12Jac+mXWdUX8gWvmpdO9ROv7Bi0YzvyqnNDVNJOr34="; + sha256 = "sha256-12Jac+mXWdUX8gWvmpde9ROv7Bi0YzvyqnNDVNJOr34="; }; preBuild = '' From a9f621f292eebab91c8b2d3ff4e1c128c74e69a0 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Sat, 22 May 2021 12:59:28 +0200 Subject: [PATCH 02/22] Update commit sha --- pkgs/development/tools/continuous-integration/drone/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 6f003005c639..b6c7227bc8d8 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { owner = "drone"; repo = "drone"; rev = "v${version}"; - sha256 = "sha256-12Jac+mXWdUX8gWvmpde9ROv7Bi0YzvyqnNDVNJOr34="; + sha256 = "sha256-BxwCJf3uY34rqegZJ6H/zb63orELhq41trOgzGXQe80="; }; preBuild = '' From 52e1188437cd2ecccf9de4e01271cc3b923a8a93 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Sat, 22 May 2021 13:21:23 +0200 Subject: [PATCH 03/22] Update vendorsha256 --- pkgs/development/tools/continuous-integration/drone/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index b6c7227bc8d8..c6d1e47389a6 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; version = "2.0.0"; - vendorSha256 = "sha256-cKHX/GnvGELQBfoi0/1UmDQ4Z66GGnnHG7+1CzjinL0="; + vendorSha256 = "sha256-cnbZSnHU+ORm7/dV+U9NfM18Zrzi24vf7qITPJsusU8="; doCheck = false; From 41fe4148a188a1bbe0e8196226d4702e86d10058 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 13 Jun 2021 16:13:38 +0200 Subject: [PATCH 04/22] xorg: fix Bigelow & Holmes fonts license --- pkgs/servers/x11/xorg/overrides.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 1e6b9888ba2f..fa41d4492b79 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -903,13 +903,16 @@ self: super: "fontbhttf" "fontbh100dpi" "fontbh75dpi" + + # Bigelow & Holmes fonts + # https://www.x.org/releases/current/doc/xorg-docs/License.html#Bigelow_Holmes_Inc_and_URW_GmbH_Luxi_font_license + "fontbhlucidatypewriter100dpi" + "fontbhlucidatypewriter75dpi" ]; # unfree, possibly not redistributable unfree = [ # no license, just a copyright notice - "fontbhlucidatypewriter100dpi" - "fontbhlucidatypewriter75dpi" "fontdaewoomisc" # unclear license, "permission to use"? From 35a8d78e44d566d6d2ddba42ae5137f7a511a090 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 18 Jun 2021 02:50:34 +0200 Subject: [PATCH 05/22] nixos-rebuild: fix --use-remote-sudo Currently fails with: $ nixos-rebuild test --target-host myhost --use-remote-sudo building Nix... sudo: /run/current-system/sw/bin/sudo must be owned by uid 0 and have the setuid bit set It seems setting an explicit PATH in the ssh command overrides the remote setuid wrappers. --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index d6853bf47299..69e0dee1d20c 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -139,7 +139,7 @@ buildHostCmd() { if [ -z "$buildHost" ]; then "$@" elif [ -n "$remoteNix" ]; then - ssh $SSHOPTS "$buildHost" env PATH="$remoteNix":'$PATH' "${maybeSudo[@]}" "$@" + ssh $SSHOPTS "$buildHost" "${maybeSudo[@]}" env PATH="$remoteNix":'$PATH' "$@" else ssh $SSHOPTS "$buildHost" "${maybeSudo[@]}" "$@" fi From ae541afbf9daf0eeb077ae272557026c0169009b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 18 Jun 2021 18:32:03 +0200 Subject: [PATCH 06/22] grafana: 8.0.2 -> 8.0.3 ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.0.3 --- pkgs/servers/monitoring/grafana/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 7420fa22e638..99acc52b9de2 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, fetchpatch }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "grafana"; - version = "8.0.2"; + version = "8.0.3"; excludedPackages = [ "release_publisher" ]; @@ -10,25 +10,16 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-kCsrLZ0EbuMwqqDvUvhm8+B/vh6FpeJ5zkwste+qwyQ="; + sha256 = "sha256-GGtmsz3c7Q6mEGCJ6cdz2CjOW0ovZZW8j6LMfFgrMZ4="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-QBMGLN3MjYJcv2vbs9GHfrCixcV7nH+Ox3o6/YtRYak="; + sha256 = "sha256-2x0FhKinrXAFenJcUDh4Q3RJNBrqixKBNZT7BZNNOj8="; }; vendorSha256 = "sha256-x7sSVIim/TOhMTbnRK/fpgxiSRSO8KwGILTE2i1gU3U="; - patches = [ - # https://github.com/grafana/grafana/pull/35635 (fixes declarative plugins for us) - (fetchpatch { - url = "https://github.com/grafana/grafana/commit/5b5cb948092bdb85e0378fd9ae01b564c4bf65f1.patch"; - sha256 = "sha256-MnCjfLiHsBSWPcxVZ2dC4q8x1/TjzR8uyQhH2Jzgx7o="; - includes = [ "pkg/util/filepath.go" ]; - }) - ]; - preBuild = '' # The testcase makes an API call against grafana.com: # From ee10001517a509fcb3807182a0b448c5f833f9cc Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 19 Jun 2021 23:11:18 +0200 Subject: [PATCH 07/22] svtplay-dl: 3.9.1 -> 4.0 --- pkgs/tools/misc/svtplay-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index ac8bd2c91c1b..0e91b9c0e562 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "3.9.1"; + version = "4.0"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "0b207l3dnkpixjhxzis77cfhwd5mjiwrmj8cngxpx2wl1i83xw54"; + sha256 = "01q03v6a2rkw49z5nbm5mghm0qmmm12pq3amsiiiv5j6m9p0fdsy"; }; pythonPaths = [ cryptography pyyaml requests ]; From c1ae14f2fc20353dbe869f4e9128582c868e391b Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 19 Jun 2021 23:15:53 +0200 Subject: [PATCH 08/22] trash-cli: 0.21.5.22 -> 0.21.6.10.1 --- pkgs/tools/misc/trash-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 3a525ac94972..ff218eb10844 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "trash-cli"; - version = "0.21.5.22"; + version = "0.21.6.10.1"; src = fetchFromGitHub { owner = "andreafrancia"; repo = "trash-cli"; rev = version; - sha256 = "0c1q13fyh9gi9gbxc55n772xlgjjr1ysnlxl41vifdcd4q8fhil8"; + sha256 = "0mhpzf3vmd876aldl5gazmk4si0zvrh0v1rwsz2hbrn0571zmzy9"; }; propagatedBuildInputs = [ python3Packages.psutil ]; From f09a1ac2b6d9e46eaa44aa545451ff5f45dc0f5e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Jun 2021 11:30:29 +0200 Subject: [PATCH 09/22] python3Packages.pyipma: init at 2.1.5 --- .../python-modules/pyipma/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/pyipma/default.nix diff --git a/pkgs/development/python-modules/pyipma/default.nix b/pkgs/development/python-modules/pyipma/default.nix new file mode 100644 index 000000000000..b34c4838cb8d --- /dev/null +++ b/pkgs/development/python-modules/pyipma/default.nix @@ -0,0 +1,36 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, geopy +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyipma"; + version = "2.1.5"; + disabled = pythonOlder "3.7"; + + # Request for GitHub releases, https://github.com/dgomes/pyipma/issues/10 + src = fetchPypi { + inherit pname version; + sha256 = "0hq5dasqpsn64x2sf6a28hdmysygmcdq4in6s08w97jfvwc6xmym"; + }; + + propagatedBuildInputs = [ + aiohttp + geopy + ]; + + # Project has no tests included in the PyPI releases + doCheck = false; + + pythonImportsCheck = [ "pyipma" ]; + + meta = with lib; { + description = "Python library to retrieve information from Instituto Português do Mar e Atmosfera"; + homepage = "https://github.com/dgomes/pyipma"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d3c455f41fef..f4690c71f717 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5965,6 +5965,8 @@ in { pyintesishome = callPackage ../development/python-modules/pyintesishome { }; + pyipma = callPackage ../development/python-modules/pyipma { }; + pyipp = callPackage ../development/python-modules/pyipp { }; pyiqvia = callPackage ../development/python-modules/pyiqvia { }; From 2bbc83edc4e3031aaeaae48185a51d0dd4b382a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Jun 2021 11:31:59 +0200 Subject: [PATCH 10/22] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 62684b3c0ba3..6c3ce7142375 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -405,7 +405,7 @@ "ios" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ]; "iota" = ps: with ps; [ ]; # missing inputs: pyota "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3 - "ipma" = ps: with ps; [ ]; # missing inputs: pyipma + "ipma" = ps: with ps; [ pyipma ]; "ipp" = ps: with ps; [ pyipp ]; "iqvia" = ps: with ps; [ numpy pyiqvia ]; "irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail From 5988bc29b304c54b7d30547057d7c0f90b3bd0af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Jun 2021 11:33:01 +0200 Subject: [PATCH 11/22] home-assistant: enable ipma tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 53cb0cac8430..3fa5d86f264d 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -474,6 +474,7 @@ in with py.pkgs; buildPythonApplication rec { "intent" "intent_script" "ios" + "ipma" "ipp" "iqvia" "islamic_prayer_times" From fa54e310aa6e395406d5f7c4f258f854f76ee74d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Jun 2021 11:44:06 +0200 Subject: [PATCH 12/22] python3Packages.millheater: init at 0.4.1 --- .../python-modules/millheater/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/millheater/default.nix diff --git a/pkgs/development/python-modules/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix new file mode 100644 index 000000000000..7639de14a670 --- /dev/null +++ b/pkgs/development/python-modules/millheater/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "millheater"; + version = "0.4.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "pymill"; + rev = version; + sha256 = "0dypv4xwdqcv45aibfkik2slm9r8y7pd2gwqa49kn96f40kdfwb0"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "mill" ]; + + meta = with lib; { + description = "Python library for Mill heater devices"; + homepage = "https://github.com/Danielhiversen/pymill"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d3c455f41fef..5293a3ffa271 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4385,6 +4385,8 @@ in { milksnake = callPackage ../development/python-modules/milksnake { }; + millheater = callPackage ../development/python-modules/millheater { }; + minidb = callPackage ../development/python-modules/minidb { }; minidump = callPackage ../development/python-modules/minidump { }; From faad598cbfa6d89e940c489e9677cdf170291406 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Jun 2021 11:45:45 +0200 Subject: [PATCH 13/22] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 62684b3c0ba3..95a41da5665e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -510,7 +510,7 @@ "microsoft_face_identify" = ps: with ps; [ aiohttp-cors ]; "miflora" = ps: with ps; [ bluepy ]; # missing inputs: miflora "mikrotik" = ps: with ps; [ librouteros ]; - "mill" = ps: with ps; [ ]; # missing inputs: millheater + "mill" = ps: with ps; [ millheater ]; "min_max" = ps: with ps; [ ]; "minecraft_server" = ps: with ps; [ aiodns getmac mcstatus ]; "minio" = ps: with ps; [ minio ]; From 0dc2567bee633e1ba1fbf1febf832a4cb5f9ab27 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Jun 2021 11:46:35 +0200 Subject: [PATCH 14/22] home-assistant: enable mill tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 53cb0cac8430..7b95059ac497 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -514,6 +514,7 @@ in with py.pkgs; buildPythonApplication rec { "microsoft_face_detect" "microsoft_face_identify" "mikrotik" + "mill" "min_max" "minecraft_server" "minio" From a415ec434fc8f4aa8d5ff7dadea6f8e196c74d5c Mon Sep 17 00:00:00 2001 From: illustris Date: Thu, 17 Jun 2021 21:11:15 +0530 Subject: [PATCH 15/22] jitsi-meet: stable/jitsi-meet_5390 -> stable/jitsi-meet_5963 --- 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 719fab87eada..cfe00e59a2ed 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.4628"; + version = "1.0.5056"; src = fetchurl { url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; - sha256 = "1kw4byy6mvqk3qd5nk5raka1bl9jp0kniszq6j5kc8nz3jql4qdz"; + sha256 = "0vmxy22zpgmvmg84y6rf9s8y3ann1xzhpaipz7fk9z4ykmkj5knw"; }; dontBuild = true; From d0d7946c0307ee4417e989ebceb9d28ac2aa4414 Mon Sep 17 00:00:00 2001 From: illustris Date: Thu, 17 Jun 2021 21:18:34 +0530 Subject: [PATCH 16/22] jitsi-videobridge: 2.1-416 -> 2.1-508 --- 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 35cd6906012d..283164380b48 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.1-416-g2f43d1b4"; + version = "2.1-508-gb24f756c"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "0s9wmbba1nlpxaawzmaqg92882y5sfs2ws64w5sqvpi7n77hy54m"; + sha256 = "0kjsm3k7chgrfvvqxkp8xdw6wfrs122j4h8gcvyvpf9lg51p199g"; }; in stdenv.mkDerivation { From aea0f9ce1f5deb8c3e425dfe6876810effd22b29 Mon Sep 17 00:00:00 2001 From: illustris Date: Thu, 17 Jun 2021 21:20:09 +0530 Subject: [PATCH 17/22] jicofo: 1.0-690 -> 1.0-756 --- 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 49e40713a0a4..37b5a1bfaa38 100644 --- a/pkgs/servers/jicofo/default.nix +++ b/pkgs/servers/jicofo/default.nix @@ -2,10 +2,10 @@ let pname = "jicofo"; - version = "1.0-690"; + version = "1.0-756"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "1w5nz2p6scd7w0ac93vhxlk5i8in5160c0icwl27m4x4km9xf6al"; + sha256 = "07qmxqp1llpn8kh590iz35zk17c2k4yg7i43nb2l0sfm40crpwfz"; }; in stdenv.mkDerivation { From 34b9ba2e6161e68febe4312c96c089d707472d5e Mon Sep 17 00:00:00 2001 From: illustris Date: Thu, 17 Jun 2021 23:44:10 +0530 Subject: [PATCH 18/22] nixos/jitsi-meet: Update jitsi prosody configs Changes made as per https://github.com/jitsi/jitsi-meet/commit/b6f7f8fba7ba81c5a0ab5477a1d103b7279bf38f --- nixos/modules/services/web-apps/jitsi-meet.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix index 2df762882fae..a98dd1f91c6c 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/nixos/modules/services/web-apps/jitsi-meet.nix @@ -187,8 +187,8 @@ in ]; extraModules = [ "pubsub" ]; extraConfig = mkAfter '' - Component "focus.${cfg.hostName}" - component_secret = os.getenv("JICOFO_COMPONENT_SECRET") + Component "focus.${cfg.hostName}" "client_proxy" + target_address = "focus@auth.${cfg.hostName}" ''; virtualHosts.${cfg.hostName} = { enabled = true; @@ -254,6 +254,7 @@ in + optionalString cfg.prosody.enable '' ${config.services.prosody.package}/bin/prosodyctl register focus auth.${cfg.hostName} "$(cat /var/lib/jitsi-meet/jicofo-user-secret)" ${config.services.prosody.package}/bin/prosodyctl register jvb auth.${cfg.hostName} "$(cat ${videobridgeSecret})" + ${config.services.prosody.package}/bin/prosodyctl mod_roster_command subscribe focus.${cfg.hostName} focus@auth.${cfg.hostName} # generate self-signed certificates if [ ! -f /var/lib/jitsi-meet.crt ]; then From 5e49c97d29455e39ba820228dc7ff7b034ecc6fb Mon Sep 17 00:00:00 2001 From: illustris Date: Fri, 18 Jun 2021 10:05:54 +0530 Subject: [PATCH 19/22] jitsi-meet-prosody: init at 1.0.5056 --- pkgs/misc/jitsi-meet-prosody/default.nix | 36 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/misc/jitsi-meet-prosody/default.nix diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/misc/jitsi-meet-prosody/default.nix new file mode 100644 index 000000000000..0ab939af0f78 --- /dev/null +++ b/pkgs/misc/jitsi-meet-prosody/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchurl, dpkg, nixosTests }: + +stdenv.mkDerivation rec { + pname = "jitsi-meet-prosody"; + version = "1.0.5056"; + src = fetchurl { + url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; + sha256 = "06qxa9h2ry92xrk2jklp76nv3sl8nvykdvsqmhn33lz6q6vmw2xr"; + }; + + dontBuild = true; + + unpackCmd = "${dpkg}/bin/dpkg-deb -x $src debcontents"; + + installPhase = '' + runHook preInstall + mkdir -p $out/share + mv usr/share/jitsi-meet/prosody-plugins $out/share/ + runHook postInstall + ''; + + passthru.tests = { + single-node-smoke-test = nixosTests.jitsi-meet; + }; + + meta = with lib; { + description = "Prosody configuration for Jitsi Meet"; + longDescription = '' + This package contains configuration for Prosody to be used with Jitsi Meet. + ''; + homepage = "https://github.com/jitsi/jitsi-meet/"; + license = licenses.asl20; + maintainers = teams.jitsi.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40be91d9a71a..0865b3716e9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19345,6 +19345,8 @@ in jitsi-meet = callPackage ../servers/web-apps/jitsi-meet { }; + jitsi-meet-prosody = callPackage ../misc/jitsi-meet-prosody { }; + jitsi-videobridge = callPackage ../servers/jitsi-videobridge { }; kapowbang = callPackage ../servers/kapowbang { }; From e0089c38ca2f9f2b9a46ffcf74a9908f53d51459 Mon Sep 17 00:00:00 2001 From: illustris Date: Fri, 18 Jun 2021 10:22:14 +0530 Subject: [PATCH 20/22] nixos/jitsi-meet: include jitsi prosody plugins in prosody extraPluginPaths --- nixos/modules/services/web-apps/jitsi-meet.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix index a98dd1f91c6c..997604754e42 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/nixos/modules/services/web-apps/jitsi-meet.nix @@ -186,6 +186,7 @@ in } ]; extraModules = [ "pubsub" ]; + extraPluginPaths = [ "${pkgs.jitsi-meet-prosody}/share/prosody-plugins" ]; extraConfig = mkAfter '' Component "focus.${cfg.hostName}" "client_proxy" target_address = "focus@auth.${cfg.hostName}" From 85aa4bf92b34a4774f7443a87ab3524bfd152002 Mon Sep 17 00:00:00 2001 From: illustris Date: Sun, 20 Jun 2021 11:22:12 +0530 Subject: [PATCH 21/22] nixos/jitsi-meet: update nixos tests - remove check for `connected .JID: focus@auth.server` because - log format was changed in https://github.com/jitsi/jicofo/commit/c1945ea6cb3dd7c815e963768abc9a3fab57101e - connection.getUser() in jicofo also appears to be broken, returning null instead of username - testing for this log line shouldn't be necessary, as we also test for "Authenticated as focus@auth.server" - remove check for `External component successfully authenticated` because - [JVB no longer uses component](https://community.jitsi.org/t/jvb-not-connecting/91157/2) - increase VM memory --- nixos/tests/jitsi-meet.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/tests/jitsi-meet.nix b/nixos/tests/jitsi-meet.nix index dec49c83121b..f9a0b121a2bf 100644 --- a/nixos/tests/jitsi-meet.nix +++ b/nixos/tests/jitsi-meet.nix @@ -8,6 +8,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { client = { nodes, pkgs, ... }: { }; server = { config, pkgs, ... }: { + virtualisation.memorySize = 512; services.jitsi-meet = { enable = true; hostName = "server"; @@ -36,15 +37,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { server.wait_until_succeeds( "journalctl -b -u jitsi-videobridge2 -o cat | grep -q 'Performed a successful health check'" ) - server.wait_until_succeeds( - "journalctl -b -u jicofo -o cat | grep -q 'connected .JID: focus@auth.server'" - ) server.wait_until_succeeds( "journalctl -b -u prosody -o cat | grep -q 'Authenticated as focus@auth.server'" ) - server.wait_until_succeeds( - "journalctl -b -u prosody -o cat | grep -q 'focus.server:component: External component successfully authenticated'" - ) server.wait_until_succeeds( "journalctl -b -u prosody -o cat | grep -q 'Authenticated as jvb@auth.server'" ) From 34e5bf44fb04c6bb524e1af77c190cd810afb1cf Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sat, 19 Jun 2021 22:40:17 +0100 Subject: [PATCH 22/22] mtools: 4.0.27 -> 4.0.31 See https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00011.html for release information --- pkgs/tools/filesystems/mtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index 8f83f800b671..4618a9b3b79a 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mtools"; - version = "4.0.27"; + version = "4.0.31"; src = fetchurl { url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2"; - sha256 = "1crqi10adwfahj8xyw60lx70hkpcc5g00b5r8277cm2f4kcwi24w"; + sha256 = "11nm5mhsq700f3dzvzjpcik89cfcn38mb249yc0sjbwggwkrk2ak"; }; patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;