Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-01-25 18:52:08 +00:00
committed by GitHub
2813 changed files with 3233 additions and 2989 deletions
@@ -1,4 +1,4 @@
{ lib, stdenv, go, buildGoPackage, fetchFromGitHub, installShellFiles }:
{ lib, go, buildGoPackage, fetchFromGitHub, installShellFiles }:
buildGoPackage rec {
pname = "alertmanager";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoModule rec {
pname = "apcupsd-exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "aws-s3-exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }:
{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
buildGoPackage rec {
pname = "bind_exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoModule rec {
pname = "bird-exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }:
{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
buildGoPackage rec {
pname = "blackbox_exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }:
{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
buildGoPackage rec {
pname = "collectd-exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "consul_exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoModule rec {
pname = "dnsmasq_exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }:
{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
buildGoPackage rec {
pname = "dovecot_exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }:
{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
buildGoPackage rec {
pname = "fritzbox-exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "gitlab-ci-pipelines-exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "haproxy_exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoModule rec {
pname = "keylight-exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoModule rec {
pname = "lndmon";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }:
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }:
buildGoModule {
pname = "mailexporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "mesos_exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoModule rec {
pname = "mikrotik-exporter-unstable";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
{ lib, buildGoPackage, fetchFromGitHub, fetchpatch }:
buildGoPackage rec {
pname = "minio-exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoModule rec {
pname = "modemmanager-exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "mysqld_exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }:
{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
buildGoPackage rec {
pname = "nginx_exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoModule rec {
pname = "nginxlog_exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }:
{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
buildGoPackage rec {
pname = "node_exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "openvpn_exporter-unstable";
@@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests
{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests
, systemd, withSystemdSupport ? true }:
with lib;
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "process-exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "prom2json";
@@ -1,4 +1,4 @@
{ lib, stdenv
{ lib
, buildGoModule
, fetchFromGitHub
}:
@@ -1,4 +1,4 @@
{ lib, stdenv, go, buildGoPackage, fetchFromGitHub }:
{ lib, go, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "pushgateway";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "rabbitmq_exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }:
{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
buildGoPackage rec {
pname = "redis_exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub, net-snmp, nixosTests }:
{ lib, buildGoPackage, fetchFromGitHub, net-snmp, nixosTests }:
buildGoPackage rec {
pname = "snmp_exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoModule rec {
pname = "sql_exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "statsd_exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }:
{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
buildGoPackage rec {
pname = "surfboard_exporter";
@@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "unifi-exporter";