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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-11-09 14:33:52 +01:00
parent 099bb158f9 f77eb9bb4d
commit 20f001c01e
313 changed files with 7523 additions and 7431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/asterisk/default.nix
+14 -4
View File
@@ -91,17 +91,18 @@ let
};
in rec {
# Supported releases (as of 2020-10-07).
# Supported releases (as of 2020-10-26).
# Source: https://wiki.asterisk.org/wiki/display/AST/Asterisk+Versions
# Exact version can be found at https://www.asterisk.org/downloads/asterisk/all-asterisk-versions/
#
# Series Type Rel. Date Sec. Fixes EOL
# 13.x LTS 2014-10-24 2020-10-24 2021-10-24
# 16.x LTS 2018-10-09 2022-10-09 2023-10-09
asterisk-lts = asterisk_16;
# 18.x LTS 2020-10-20 2024-10-20 2025-10-20
asterisk-lts = asterisk_18;
# 17.x Standard 2019-10-28 2020-10-28 2021-10-28
asterisk-stable = asterisk_17;
asterisk = asterisk_17;
asterisk-stable = asterisk_18;
asterisk = asterisk_18;
asterisk_13 = common {
version = "13.37.0";
@@ -129,4 +130,13 @@ in rec {
"addons/mp3" = mp3-202;
};
};
asterisk_18 = common {
version = "18.0.0";
sha256 = "174zasx8d7ragy2fz4vwc4pbra9wl471mnisz1z0a3b2qsbh4y4v";
externals = {
"externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
"addons/mp3" = mp3-202;
};
};
}
pkgs/servers/go-libp2p-daemon/default.nix
+23
View File
@@ -0,0 +1,23 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule {
pname = "go-libp2p-daemon";
version = "0.3.0";
src = fetchFromGitHub {
owner = "libp2p";
repo = "go-libp2p-daemon";
rev = "bfa207ed34c27947f0828a4ae8d10bda62aa49a9";
sha256 = "1f3gjkmpqngajjpijpjdmkmsjfm9bdgakb5r28fnc6w9dmfyj51x";
};
vendorSha256 = "0g25r7wd1hvnwxxq18mpx1r1wig6dnlnvzkpvgw79q6nymxlppmv";
doCheck = false;
meta = with lib; {
homepage = "https://github.com/libp2p/go-libp2p-daemon";
license = licenses.mit;
maintainers = with maintainers; [ fare ];
};
}
pkgs/servers/home-assistant/component-packages.nix
+7 -7
View File
@@ -2,7 +2,7 @@
# Do not edit!
{
version = "0.117.4";
version = "0.117.5";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
@@ -74,7 +74,7 @@
"bbb_gpio" = ps: with ps; [ ]; # missing inputs: Adafruit_BBIO
"bbox" = ps: with ps; [ ]; # missing inputs: pybbox
"beewi_smartclim" = ps: with ps; [ ]; # missing inputs: beewi_smartclim
"bh1750" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi
"bh1750" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
"binary_sensor" = ps: with ps; [ ];
"bitcoin" = ps: with ps; [ ]; # missing inputs: blockchain
"bizkaibus" = ps: with ps; [ ]; # missing inputs: bizkaibus
@@ -88,8 +88,8 @@
"bluesound" = ps: with ps; [ xmltodict ];
"bluetooth_le_tracker" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL]
"bluetooth_tracker" = ps: with ps; [ bt_proximity ]; # missing inputs: pybluez
"bme280" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi
"bme680" = ps: with ps; [ ]; # missing inputs: bme680 smbus-cffi
"bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
"bme680" = ps: with ps; [ bme680 smbus-cffi ];
"bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280
"bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected
"bond" = ps: with ps; [ ]; # missing inputs: bond-api
@@ -222,7 +222,7 @@
"enphase_envoy" = ps: with ps; [ ]; # missing inputs: envoy_reader
"entur_public_transport" = ps: with ps; [ ]; # missing inputs: enturclient
"environment_canada" = ps: with ps; [ ]; # missing inputs: env_canada
"envirophat" = ps: with ps; [ ]; # missing inputs: envirophat smbus-cffi
"envirophat" = ps: with ps; [ smbus-cffi ]; # missing inputs: envirophat
"envisalink" = ps: with ps; [ ]; # missing inputs: pyenvisalink
"ephember" = ps: with ps; [ ]; # missing inputs: pyephember
"epson" = ps: with ps; [ ]; # missing inputs: epson-projector
@@ -358,7 +358,7 @@
"hp_ilo" = ps: with ps; [ ]; # missing inputs: python-hpilo
"html5" = ps: with ps; [ aiohttp-cors pywebpush ];
"http" = ps: with ps; [ aiohttp-cors ];
"htu21d" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi
"htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
"huawei_lte" = ps: with ps; [ getmac stringcase ]; # missing inputs: huawei-lte-api url-normalize
"huawei_router" = ps: with ps; [ ];
"hue" = ps: with ps; [ aiohue ];
@@ -657,7 +657,7 @@
"rainforest_eagle" = ps: with ps; [ ]; # missing inputs: eagle200_reader uEagle
"rainmachine" = ps: with ps; [ ]; # missing inputs: regenmaschine
"random" = ps: with ps; [ ];
"raspihats" = ps: with ps; [ ]; # missing inputs: raspihats smbus-cffi
"raspihats" = ps: with ps; [ smbus-cffi ]; # missing inputs: raspihats
"raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client
"recollect_waste" = ps: with ps; [ ]; # missing inputs: recollect-waste
"recorder" = ps: with ps; [ sqlalchemy ];
pkgs/servers/home-assistant/default.nix
+2 -2
View File
@@ -67,7 +67,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "0.117.4";
hassVersion = "0.117.5";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -83,7 +83,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
sha256 = "0f5a5y6d9wxdfd5l526dz34xz2n1a6ia7vdcr7sqf2qp51brpw52";
sha256 = "1al2pwj2xrhqyaz2pal4a1bdh4sm63ijfaw8pajghz5z23gf62r0";
};
# leave this in, so users don't have to constantly update their downstream patch handling
pkgs/servers/mlflow-server/default.nix
+2 -2
View File
@@ -3,7 +3,7 @@
let
py = python3.pkgs;
in
py.toPythonApplication
py.toPythonApplication
(py.mlflow.overridePythonAttrs(old: rec {
pname = "mlflow-server";
@@ -34,4 +34,4 @@ py.toPythonApplication
cp ${gunicornScript} $gpath
chmod 555 $gpath
'';
}))
}))
pkgs/servers/monitoring/prometheus/sql-exporter.nix
+23
View File
@@ -0,0 +1,23 @@
{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoModule rec {
pname = "sql_exporter";
version = "0.3.0";
vendorSha256 = null;
src = fetchFromGitHub {
owner = "justwatchcom";
repo = "sql_exporter";
rev = "v${version}";
sha256 = "125brlxgwhkn3z5v0522gpm0sk6v905ghh05c4c3wf1hlm7bhnrc";
};
meta = with stdenv.lib; {
description = "Flexible SQL exporter for Prometheus";
homepage = "https://github.com/justwatchcom/sql_exporter";
license = licenses.mit;
maintainers = with maintainers; [ justinas ];
platforms = platforms.unix;
};
}
pkgs/servers/nats-server/default.nix
+2 -2
View File
@@ -4,7 +4,7 @@ with lib;
buildGoPackage rec {
pname = "nats-server";
version = "2.1.7";
version = "2.1.9";
goPackagePath = "github.com/nats-io/${pname}";
@@ -12,7 +12,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "nats-io";
repo = pname;
sha256 = "08wqaqar964p9adc0ma8dqg0rf88rylk1m2mddlbbqmd6l4h6m27";
sha256 = "0y92isca1dlvprik0lbiz8ny1w84svy4zn73brqhzrkxnqppcxi2";
};
meta = {
pkgs/servers/nextcloud/default.nix
+4 -4
View File
@@ -40,14 +40,14 @@ in {
'';
nextcloud18 = generic {
version = "18.0.9";
sha256 = "0rigg5pv2vnxgmjznlvxfc41s00raxa8jhib5vsznhj55qn99jm1";
version = "18.0.10";
sha256 = "0kv9mdn36shr98kh27969b8xs7pgczbyjklrfskxy9mph7bbzir6";
insecure = true;
};
nextcloud19 = generic {
version = "19.0.3";
sha256 = "0sc9cnsdh8kj60h7i3knh40ngdz1w1wmdqw2v2axfkmax22kjl7w";
version = "19.0.4";
sha256 = "0y5fccn61qf9fxjjpqdvhmxr9w5n4dgl1d7wcl2dzjv4bmqi2ms6";
};
nextcloud20 = generic {
pkgs/servers/sql/patroni/default.nix
+1 -1
View File
@@ -39,7 +39,7 @@ pythonPackages.buildPythonApplication rec {
checkInputs = with pythonPackages; [
flake8
mock
pytest
pytestCheckHook
pytestcov
requests
];
pkgs/servers/web-apps/wordpress/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wordpress";
version = "5.5.1";
version = "5.5.3";
src = fetchurl {
url = "https://wordpress.org/${pname}-${version}.tar.gz";
sha256 = "15cjp48q23fw8ryy39mlxi4rd3rha2yqyrnk5mhx0h72ygawx8k6";
sha256 = "sTkmdr9Mulw7XwNEMJBU81rwNV/agNpBjCznGuObrtQ=";
};
installPhase = ''
pkgs/servers/x11/xorg/default.nix
+2 -2
View File
@@ -1963,7 +1963,7 @@ lib.makeScope newScope (self: with self; {
meta.platforms = stdenv.lib.platforms.unix;
}) {};
xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation {
xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC, libXv }: stdenv.mkDerivation {
name = "xf86-video-intel-2.99.917";
builder = ./builder.sh;
src = fetchurl {
@@ -1972,7 +1972,7 @@ lib.makeScope newScope (self: with self; {
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ];
buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC libXv ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};