colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-06-20 12:04:41 +00:00 committed by GitHub
commit cca41fbbb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 149 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/web-apps/jitsi-meet.nix
View File

@ -186,9 +186,10 @@ in
}
];
extraModules = [ "pubsub" ];
extraPluginPaths = [ "${pkgs.jitsi-meet-prosody}/share/prosody-plugins" ];
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 +255,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

7
nixos/tests/jitsi-meet.nix
View File

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

37
pkgs/development/python-modules/millheater/default.nix Normal file
View File

@ -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 ];
};
}

36
pkgs/development/python-modules/pyipma/default.nix Normal file
View File

@ -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 ];
};
}

6
pkgs/development/tools/continuous-integration/drone/default.nix
View File

@ -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-cnbZSnHU+ORm7/dV+U9NfM18Zrzi24vf7qITPJsusU8=";
doCheck = false;
@ -13,7 +13,7 @@ buildGoModule rec {
owner = "drone";
repo = "drone";
rev = "v${version}";
sha256 = "sha256-12Jac+mXWdUX8gWvmpdO9ROv7Bi0YzvyqnNDVNJOr34=";
sha256 = "sha256-BxwCJf3uY34rqegZJ6H/zb63orELhq41trOgzGXQe80=";
};
preBuild = ''

36
pkgs/misc/jitsi-meet-prosody/default.nix Normal file
View File

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

2
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
View File

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

4
pkgs/servers/home-assistant/component-packages.nix
View File

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

2
pkgs/servers/home-assistant/default.nix
View File

@ -474,6 +474,7 @@ in with py.pkgs; buildPythonApplication rec {
"intent"
"intent_script"
"ios"
"ipma"
"ipp"
"iqvia"
"islamic_prayer_times"
@ -514,6 +515,7 @@ in with py.pkgs; buildPythonApplication rec {
"microsoft_face_detect"
"microsoft_face_identify"
"mikrotik"
"mill"
"min_max"
"minecraft_server"
"minio"

4
pkgs/servers/jicofo/default.nix
View File

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

4
pkgs/servers/jitsi-videobridge/default.nix
View File

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

17
pkgs/servers/monitoring/grafana/default.nix
View File

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

4
pkgs/servers/web-apps/jitsi-meet/default.nix
View File

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

7
pkgs/servers/x11/xorg/overrides.nix
View File

@ -907,13 +907,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"?

4
pkgs/tools/filesystems/mtools/default.nix
View File

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

4
pkgs/tools/misc/svtplay-dl/default.nix
View File

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

4
pkgs/tools/misc/trash-cli/default.nix
View File

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

2
pkgs/top-level/all-packages.nix
View File

@ -19355,6 +19355,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 { };

4
pkgs/top-level/python-packages.nix
View File

@ -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 { };
@ -5965,6 +5967,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 { };