diff options
author | volth <volth@volth.com> | 2018-07-21 00:44:44 +0000 |
---|---|---|
committer | volth <volth@volth.com> | 2018-07-21 02:48:04 +0000 |
commit | 52f53c69ce6dbc5538f7e4cd22f9d93baf1f64a2 (patch) | |
tree | 2519a24bfee83cad4268e77ac180c84cb4036ed7 /pkgs/servers | |
parent | 1a6af9f88ec2405334a9fd6a977ccbcb53472305 (diff) |
pkgs/*: remove unreferenced function arguments
Diffstat (limited to 'pkgs/servers')
71 files changed, 73 insertions, 77 deletions
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 4cc187846d0d0..22a9aef8edab1 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, runCommand +{ stdenv, fetchurl , erlang, python, libxml2, libxslt, xmlto , docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync , AppKit, Carbon, Cocoa diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index b1d60d8c14567..b2b681bcc8bd9 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, lib, fetchurl, fetchgit, fetchsvn, fetchpatch, +{ stdenv, lib, fetchurl, fetchsvn, jansson, libxml2, libxslt, ncurses, openssl, sqlite, utillinux, dmidecode, libuuid, newt, lua, speex, diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 548d01c249d20..ee403ab49f098 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "caddy-${version}"; diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index 90c87f8019d09..8335e40de98f5 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchurl, zip, unzip, makeWrapper +{ stdenv, lib, fetchurl, zip, unzip , jzmq, jdk, python -, logsDir ? "", confFile ? "", extraLibraryPaths ? [], extraJars ? [] }: +, confFile ? "", extraLibraryPaths ? [], extraJars ? [] }: stdenv.mkDerivation rec { name = "apache-storm-" + version; diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index d2ad5d0bd8e83..5cf192791000c 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, consul-ui, fetchFromGitHub }: +{ stdenv, buildGoPackage, consul-ui, fetchFromGitHub }: buildGoPackage rec { name = "consul-${version}"; diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix index 13a78d61098b6..8a1bb6313ad2d 100644 --- a/pkgs/servers/dict/dictd-wordnet.nix +++ b/pkgs/servers/dict/dictd-wordnet.nix @@ -1,4 +1,4 @@ -{stdenv, fetchsvn, python, wordnet, writeScript}: +{stdenv, python, wordnet, writeScript}: stdenv.mkDerivation rec { version = "542"; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index bfa610b57d8ab..90cbc6cec55db 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -2,7 +2,7 @@ , knot-dns, luajit, libuv, lmdb, gnutls, nettle , cmocka, systemd, dns-root-data, makeWrapper , extraFeatures ? false /* catch-all if defaults aren't enough */ -, hiredis, libmemcached, luajitPackages +, luajitPackages }: let # un-indented, over the whole file diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 2c82b0bf33a8c..1ac1d3948942e 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, libevent, openssl +{ stdenv, fetchurl, libevent, openssl , bind8Stats ? false , checking ? false , ipv6 ? true diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 29cb8c2223c06..d6b71f8160839 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, libpcap, buildGoPackage, fetchFromGitHub }: +{ lib, libpcap, buildGoPackage, fetchFromGitHub }: with lib; diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix index c1234606291da..5e2381ada1d10 100644 --- a/pkgs/servers/exhibitor/default.nix +++ b/pkgs/servers/exhibitor/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, buildMaven, maven, jdk, makeWrapper, stdenv, ... }: +{ fetchFromGitHub, maven, jdk, makeWrapper, stdenv, ... }: stdenv.mkDerivation rec { name = "exhibitor-${version}"; version = "1.5.6"; diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index 24ed1dffd4d87..caf7d8360f076 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libedit, ncurses, automake, autoconf, libtool +{stdenv, fetchurl, libedit, automake, autoconf, libtool , # icu = null: use icu which comes with firebird diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index 89f1821981fcb..ebade244bdf7e 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "gotty-${version}"; diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index fc9d4c0508edb..c4be1f3c3b34a 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, jre, makeWrapper, unzip }: +{ stdenv, fetchzip, jre, makeWrapper }: stdenv.mkDerivation rec { name = "h2-${version}"; diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index dcd81fa44b055..6a33ac638d215 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ stdenv, fetchurl, makeWrapper }: stdenv.mkDerivation rec { name = "hbase-${version}"; version = "0.98.24"; diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 493131795034e..d921eee49cfcc 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchpatch }: +{ lib, python3 }: let python = python3.override { diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 43334819dc564..5a873c7e84b1c 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man, python +{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man , sphinx, which, file, pkgconfig, getopt }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/http/jboss/jdbc/mysql/default.nix b/pkgs/servers/http/jboss/jdbc/mysql/default.nix index dbc5c73414cd5..fd2dec44c7f39 100644 --- a/pkgs/servers/http/jboss/jdbc/mysql/default.nix +++ b/pkgs/servers/http/jboss/jdbc/mysql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, jboss, mysql_jdbc }: +{ stdenv, mysql_jdbc }: stdenv.mkDerivation { name = "jboss-mysql-jdbc"; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 4486959300397..643e7ed719a47 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -1,10 +1,9 @@ -{ stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat +{ stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt , gd, geoip , withDebug ? false , withStream ? true , withMail ? false , modules ? [] -, hardening ? true , version, sha256, ... }: diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 1f6fcc319435b..0910a6d058449 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchurl, lib, pkgs }: +{ fetchFromGitHub, lib, pkgs }: { brotli = { diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index 33801c8cd3264..479c9e41aa91d 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl +{stdenv , coreutils, findutils, nix, xz, bzip2, gnused, gnugrep, openssl , lighttpd, iproute }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 1155bac757035..1fe48e84fac75 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, postgresql, libxml2, libxslt, +{ stdenv, fetchurl, openssl, zlib, pcre, postgresql, libxml2, libxslt, gd, geoip, perl }: with stdenv.lib; diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix index 0df055f9690f9..f57c94cd10849 100644 --- a/pkgs/servers/interlock/default.nix +++ b/pkgs/servers/interlock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, sudo, coreutils, systemd, cryptsetup +{ sudo, coreutils, systemd, cryptsetup , mount, umount , buildGoPackage, fetchFromGitHub }: diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index 5aafe55512beb..9e8a9dc9ec600 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python2, fetchurl, fetchFromGitHub }: +{ stdenv, python2, fetchFromGitHub }: let python = python2.override { packageOverrides = self: super: { diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 6826df5f6e869..4276a51715a6c 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, pam, nspr, nss, openldap +{ stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap , db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages }: let diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index e676246a08ec2..5a9d8e61b1fee 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, perl, pkgconfig, systemd, openssl +{ stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl , bzip2, zlib, lz4, inotify-tools, pam, libcap , clucene_core_2, icu, openldap, libsodium, libstemmer # Auth modules diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix index f11400c190af9..98b270ad7d413 100644 --- a/pkgs/servers/mail/mlmmj/default.nix +++ b/pkgs/servers/mail/mlmmj/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 302aa8d55932f..8c86cc6577a7a 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, stdenv, pythonPackages, fetchurl, fetchFromGitHub, fetchpatch }: +{ stdenv, pythonPackages, fetchurl, fetchFromGitHub }: let matrix-angular-sdk = pythonPackages.buildPythonPackage rec { name = "matrix-angular-sdk-${version}"; diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix index 53c87745e67ac..fe1f1c6760d8a 100644 --- a/pkgs/servers/mesos-dns/default.nix +++ b/pkgs/servers/mesos-dns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "mesos-dns-${version}"; diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix index 98ac1534cf8a8..10c8811c548fa 100644 --- a/pkgs/servers/mirrorbits/default.nix +++ b/pkgs/servers/mirrorbits/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchpatch +{ lib, buildGoPackage, fetchFromGitHub, fetchpatch , pkgconfig, zlib, geoip }: buildGoPackage rec { diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 0480d056c592a..0e256d907dc26 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, fetchFromGitHub }: +{ stdenv, go, fetchFromGitHub }: stdenv.mkDerivation rec { name = "cadvisor-${version}"; diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index 646a7856788b0..a888549bb6aa9 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "consul-alerts-${version}"; diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index 34b4e87bf65c6..96eaa5ef0cc42 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildPerlPackage, perlPackages, gnused, nix, dmidecode, pciutils, usbutils, iproute, nettools +{ stdenv, lib, fetchurl, buildPerlPackage, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools , fetchFromGitHub, makeWrapper }: diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix index 409801e8b7dc1..0e21069bbb0ea 100644 --- a/pkgs/servers/monitoring/kapacitor/default.nix +++ b/pkgs/servers/monitoring/kapacitor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { name = "kapacitor-${version}"; diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index 859849f7b2c71..af5f2880a0f89 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig -, doxygen, freetype, libX11, libftdi, libftdi1, libusb, libusb1, ncurses, perl }: +, doxygen, freetype, libX11, libftdi, libusb, libusb1, ncurses, perl }: stdenv.mkDerivation rec { name = "lcdproc-${version}"; diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index 957aee43691aa..5d93f4c534963 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, buildPerlPackage, autoreconfHook, makeWrapper +{ stdenv, fetchFromGitHub, fetchurl, autoreconfHook, makeWrapper , perl, DBDsybase, NetSNMP, coreutils, gnused, gnugrep }: let diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 798f31c3458e1..1f342adebaa07 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "blackbox_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 2bd9b6af07485..0d6fbac60e5d8 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "collectd-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index 2e7a4932de625..1271b3d40e141 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "fritzbox-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix index ea17c0b18b23d..ffba472bdc335 100644 --- a/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchFromGitHub, lib }: +{ buildGoPackage, fetchFromGitHub, lib }: buildGoPackage rec { name = "prometheus-json-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index 42ff2496df120..ade9bb87d9933 100644 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "mesos_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix index 59314f1f282ac..8b6c54d41f91b 100644 --- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { name = "minio-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index 788fe8633967c..5e4ebb581400b 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "prom2json-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index 9692354ad8a8b..29454dd44d2b4 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, net_snmp }: +{ stdenv, buildGoPackage, fetchFromGitHub, net_snmp }: buildGoPackage rec { name = "snmp_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix index f4d9f5a85037b..e5480e0203721 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "statsd_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix index 13e17d0b0192b..0c5cc62676594 100644 --- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "surfboard_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix index 44a670b95ab4c..18fa3f98db234 100644 --- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "unifi-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index d83aa5b46658b..b23270cd8c1e1 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, varnish }: +{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, varnish }: buildGoPackage rec { name = "prometheus_varnish_exporter-${version}"; diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index d3816cf1ecdb2..9f1a2baeb9ac8 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext +{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib , enableJabber ? false, minmay ? null }: assert enableJabber -> minmay != null; diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index bc5556d4bc00c..bf3849e6524b0 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext +{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib , net_snmp , libssh2, openldap , enableJabber ? false, minmay ? null , enableSnmp ? false diff --git a/pkgs/servers/monitoring/zabbix/3.4.nix b/pkgs/servers/monitoring/zabbix/3.4.nix index 69b3577720f5c..047ce0a5130e9 100644 --- a/pkgs/servers/monitoring/zabbix/3.4.nix +++ b/pkgs/servers/monitoring/zabbix/3.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, pcre, libevent, libiconv }: +{ stdenv, fetchurl, pcre, libiconv }: let diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 35637e7f73aca..f8523e8607d35 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, glib, systemd, boost, darwin +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, systemd, boost, darwin , alsaSupport ? true, alsaLib , avahiSupport ? true, avahi, dbus , flacSupport ? true, flac diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 0121d748129ba..3d6a1aa9c6fa4 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name= "nextcloud-${version}"; diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 9b21deecf4b30..f3d3fed23a417 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, openssl, zlib, python2Packages, readline, cmake, python }: +, openssl, zlib, readline, cmake, python }: let in stdenv.mkDerivation rec { diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index f97a3a5c1842d..1d3240fae716d 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, git, mono, v8 }: +{ stdenv, fetchFromGitHub, git, mono, v8 }: # There are some similarities with the pinta derivation. We should # have a helper to make it easy to package these Mono apps. diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index b9e850e8dfd4d..c62ade1a20bbc 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy -, zlib, libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security +, zlib, libyamlcpp, sasl, openssl, libpcap, Security }: # Note: diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index e935b5d098797..d6ee407e3418c 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, m4, python +{ stdenv, fetchurl, which, m4 , protobuf, boost, zlib, curl, openssl, icu, jemalloc, libtool , python2Packages, makeWrapper }: diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix index 9075756c16214..cf807e70596dc 100644 --- a/pkgs/servers/nosql/riak-cs/2.1.1.nix +++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak +{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam , Carbon ? null, Cocoa ? null }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/nosql/riak-cs/stanchion.nix b/pkgs/servers/nosql/riak-cs/stanchion.nix index a064049072c96..1524ca207009c 100644 --- a/pkgs/servers/nosql/riak-cs/stanchion.nix +++ b/pkgs/servers/nosql/riak-cs/stanchion.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak +{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam , Carbon ? null, Cocoa ? null }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index e4c9b90ab1455..b041aa9f35fc7 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, erlang, which, pam, coreutils }: +{ stdenv, lib, fetchurl, unzip, erlang, which, pam }: let solrName = "solr-4.10.4-yz-2.tgz"; diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix index fa78c876c1ec3..d48587c924e78 100644 --- a/pkgs/servers/nsq/default.nix +++ b/pkgs/servers/nsq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "nsq-${version}"; diff --git a/pkgs/servers/openafs/1.6/default.nix b/pkgs/servers/openafs/1.6/default.nix index 3f92299c2a0a2..22f09994ebf0d 100644 --- a/pkgs/servers/openafs/1.6/default.nix +++ b/pkgs/servers/openafs/1.6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc +{ stdenv, fetchurl, which, autoconf, automake, flex, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43 , ncurses # Extra ncurses utilities. Only needed for debugging. , tsmbac ? null # Tivoli Storage Manager Backup Client from IBM diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index 59c15839b3937..fc6b1bc2426b9 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc +{ stdenv, fetchurl, which, autoconf, automake, flex, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43 , libtool_2, removeReferencesTo , ncurses # Extra ncurses utilities. Only needed for debugging. diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index ed4a8889c67dc..73af65ef25614 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -5,9 +5,6 @@ , sbc, bluez5, udev, openssl, fftwFloat , speexdsp, systemd, webrtc-audio-processing, gconf ? null -# Database selection -, tdb ? null, gdbm ? null - , x11Support ? false , useSystemd ? true diff --git a/pkgs/servers/rippled/data-api.nix b/pkgs/servers/rippled/data-api.nix index 230e0aee2181d..04d520b412c14 100644 --- a/pkgs/servers/rippled/data-api.nix +++ b/pkgs/servers/rippled/data-api.nix @@ -1,4 +1,4 @@ -{ lib, fetchgit, fetchurl, nodePackages }: +{ lib, fetchgit, nodePackages }: with lib; diff --git a/pkgs/servers/rippled/package.nix b/pkgs/servers/rippled/package.nix index 6f5bb1d3a71fe..87f4326c48c34 100644 --- a/pkgs/servers/rippled/package.nix +++ b/pkgs/servers/rippled/package.nix @@ -1,4 +1,4 @@ -{ self, fetchurl, fetchgit ? null, lib }: +{ self, fetchurl ? null }: { by-spec."abbrev"."1" = diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 0ff7f88911f26..eec80cb66bcc2 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl , fetchpatch -, docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc +, docbook_xml_dtd_42, readline, talloc , popt, iniparser, libbsd, libarchive, libiconv, gettext , krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs -, gnutls, libgcrypt, libgpgerror +, gnutls , ncurses, libunwind, libibverbs, librdmacm, systemd , enableInfiniband ? false diff --git a/pkgs/servers/samba/master.nix b/pkgs/servers/samba/master.nix index df1f9feb4de5b..21038a0f2183e 100644 --- a/pkgs/servers/samba/master.nix +++ b/pkgs/servers/samba/master.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ fetchFromGitHub , samba4 , nettle } : diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index ade2ea9445345..b93d8c2203d7c 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchurl, fetchFromGitHub, unzip, elasticsearch }: +{ pkgs, stdenv, fetchurl, unzip, elasticsearch }: with pkgs.lib; diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index ccb174371e0ce..7bfea23c78b5a 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "skydns-${version}"; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 126a8cf0690e6..121e42f7a978c 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, ncurses, zlib, xz, lzo, lz4, bzip2, snappy , libiconv, openssl, pcre, boost, judy, bison, libxml2 -, libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl +, libaio, libevent, jemalloc, cracklib, systemd, numactl, perl , fixDarwinDylibNames, cctools, CoreServices , asio, buildEnv, check, scons }: diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 9c133f9d5d992..3fc7aaea9c935 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, substituteAll, xterm, makeWrapper, ruby -, openssl, quartz-wm, fontconfig, xlsfonts, xfontsel +{ stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, xterm, makeWrapper, ruby +, quartz-wm, fontconfig, xlsfonts, xfontsel , ttf_bitstream_vera, freefont_ttf, liberation_ttf , shell ? "${bashInteractive}/bin/bash" }: |