Merge master into staging

97 files changed, 366 insertions, 224 deletions

diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 4cc187846d0d..22a9aef8edab 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 b1d60d8c1456..b2b681bcc8bd 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 548d01c249d2..ee403ab49f09 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 90c87f8019d0..8335e40de98f 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 d2ad5d0bd8e8..5cf192791000 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/coturn/default.nix b/pkgs/servers/coturn/default.nix
index f83ef4cef388..0891b72cd1e9 100644
--- a/pkgs/servers/coturn/default.nix
+++ b/pkgs/servers/coturn/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchFromGitHub, openssl, libevent }:
 
-let inherit (stdenv.lib) optional; in
-
 stdenv.mkDerivation rec {
   name = "coturn-${version}";
   version = "4.5.0.7";
diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix
index 13a78d61098b..8a1bb6313ad2 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-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index ef99772a082d..2bdd758b9802 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn
+{ stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
 , systemd, nettle, libedit, zlib, libiconv, libintl
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    gnutls liburcu libidn
+    gnutls liburcu libidn2 libunistring
     nettle libedit
     libiconv lmdb libintl
     # without sphinx &al. for developer documentation
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index bfa610b57d8a..1d7e5722ea78 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -2,13 +2,13 @@
 , 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
 
 result = if extraFeatures then wrapped-full else unwrapped;
 
-inherit (stdenv.lib) optional optionals optionalString concatStringsSep;
+inherit (stdenv.lib) optional concatStringsSep;
 
 unwrapped = stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 2c82b0bf33a8..1ac1d3948942 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 29cb8c2223c0..d6b71f816083 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 c1234606291d..5e2381ada1d1 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 24ed1dffd4d8..caf7d8360f07 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/foswiki/default.nix b/pkgs/servers/foswiki/default.nix
index 5bfeef6f1fc1..542322d0e621 100644
--- a/pkgs/servers/foswiki/default.nix
+++ b/pkgs/servers/foswiki/default.nix
@@ -14,7 +14,7 @@ perlPackages.buildPerlPackage rec {
   buildInputs = with perlPackages; [
     # minimum requirements from INSTALL.html#System_Requirements
     AlgorithmDiff ArchiveTar AuthenSASL CGI CGISession CryptPasswdMD5
-    DigestSHA EmailMIME Encode Error FileCopyRecursive HTMLParser HTMLTree
+    EmailMIME Encode Error FileCopyRecursive HTMLParser HTMLTree
     IOSocketIP IOSocketSSL JSON
     LocaleMaketext LocaleMaketextLexicon LocaleMsgfmt
     LWP URI perlPackages.version
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index ecefc1d8fabd..461b90bc978c 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -53,7 +53,9 @@ let
         patches =
           [ # For 5.2+, we need a slightly adjusted patch to fix all the ldflags
             (if lib.versionAtLeast version "5.2"
-             then ./ldflags.patch
+             then (if lib.versionAtLeast version "6.0"
+                   then ./ldflags-6.0.patch
+                   else ./ldflags-5.2.patch)
              else ./ldflags-5.1.patch)
           ] ++
           # for 6.0+, we do NOT need to apply this version fix, since we can specify
@@ -77,10 +79,20 @@ let
             --replace 'exit 1' '#exit 1'
 
           patchShebangs .
+        '' + lib.optionalString (lib.versionAtLeast version "6.0") ''
+          substituteInPlace ./Makefile \
+            --replace 'TLS_LIBS +=' '#TLS_LIBS +=' \
+            --replace 'LDFLAGS :=' 'LDFLAGS := -ltls -lssl -lcrypto'
         '';
 
         enableParallelBuilding = true;
-        makeFlags = [ "all" "fdb_c" "fdb_java" "KVRELEASE=1" ];
+
+        makeFlags = [ "all" "fdb_java" ]
+          # Don't compile FDBLibTLS if we don't need it in 6.0 or later;
+          # it gets statically linked in
+          ++ lib.optional (!lib.versionAtLeast version "6.0") [ "fdb_c" ]
+          # Needed environment overrides
+          ++ [ "KVRELEASE=1" ];
 
         # on 6.0 and later, we can specify all this information manually
         configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") ''
@@ -93,7 +105,9 @@ let
           mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb
 
           cp -v ./lib/libfdb_c.so     $lib/lib
+        '' + lib.optionalString (!lib.versionAtLeast version "6.0") ''
           cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so
+        '' + ''
 
           cp -v ./bindings/c/foundationdb/fdb_c.h           $dev/include/foundationdb
           cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb
@@ -131,15 +145,16 @@ in with builtins; {
   };
 
   foundationdb52 = makeFdb rec {
-    version = "5.2.5";
+    version = "5.2.6";
     branch  = "release-5.2";
-    sha256  = "00csr4v9cwl9y8r63p73grc6cvhlqmzcniwrf80i0klxv5asg7q7";
+    rev     = "refs/tags/v5.2.6"; # seemed to be tagged incorrectly
+    sha256  = "1q3lq1hqq0f53n51gd4cw5cpayyw65dmkfplhsw1m5mghymzmskk";
   };
 
   foundationdb60 = makeFdb rec {
-    version = "6.0.0pre2227_${substring 0 8 rev}";
-    branch  = "master";
-    rev     = "8caa6eaecf1eeec0298fc77db334761b0c1d1523";
-    sha256  = "1q200rpsphl5fzwzp2vk7ifgsnqh95k0xfiicfi1c8253ylnsgll";
+    version = "6.0.2pre2430_${substring 0 8 rev}";
+    branch  = "release-6.0";
+    rev     = "7938d247a5eaf886a176575de6592b76374df58c";
+    sha256  = "0g8h2zs0f3aacs7x4hyjh0scybv33gjj6dqfb789h4n6r4gd7d9h";
   };
 }
diff --git a/pkgs/servers/foundationdb/ldflags.patch b/pkgs/servers/foundationdb/ldflags-5.2.patch
index ee5911e495f8..ee5911e495f8 100644
--- a/pkgs/servers/foundationdb/ldflags.patch
+++ b/pkgs/servers/foundationdb/ldflags-5.2.patch
diff --git a/pkgs/servers/foundationdb/ldflags-6.0.patch b/pkgs/servers/foundationdb/ldflags-6.0.patch
new file mode 100644
index 000000000000..1fa17a9615aa
--- /dev/null
+++ b/pkgs/servers/foundationdb/ldflags-6.0.patch
@@ -0,0 +1,78 @@
+diff --git a/bindings/c/local.mk b/bindings/c/local.mk
+index c861a29c..ff886e93 100644
+--- a/bindings/c/local.mk
++++ b/bindings/c/local.mk
+@@ -30,8 +30,8 @@ fdb_c_tests_HEADERS := -Ibindings/c
+ CLEAN_TARGETS += fdb_c_tests_clean
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdb_c_LIBS += lib/libstdc++.a -lm -lpthread -lrt -ldl
+-  fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete
++  fdb_c_LIBS += lib/libstdc++.a
++  fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -lm -lpthread -lrt -ldl
+   fdb_c_tests_LIBS += -lpthread
+ endif
+ 
+diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk
+index 2ef4fcb7..6e59625c 100644
+--- a/bindings/flow/tester/local.mk
++++ b/bindings/flow/tester/local.mk
+@@ -35,8 +35,7 @@ _fdb_flow_tester_clean:
+ 	@rm -rf bindings/flow/bin
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdb_flow_tester_LIBS += -ldl -lpthread -lrt
+-  fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc
++  fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
+ else ifeq ($(PLATFORM),osx)
+   fdb_flow_tester_LDFLAGS += -lc++
+ endif
+diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk
+index ca5dbab6..012f0130 100644
+--- a/fdbbackup/local.mk
++++ b/fdbbackup/local.mk
+@@ -26,8 +26,7 @@ fdbbackup_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB
+ fdbbackup_STATIC_LIBS := $(TLS_LIBS)
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdbbackup_LIBS += -ldl -lpthread -lrt
+-  fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc
++  fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
+ 
+   # GPerfTools profiler (uncomment to use)
+   # fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
+diff --git a/fdbcli/local.mk b/fdbcli/local.mk
+index fd738876..3af026b9 100644
+--- a/fdbcli/local.mk
++++ b/fdbcli/local.mk
+@@ -22,14 +22,13 @@
+ 
+ fdbcli_CFLAGS := $(fdbclient_CFLAGS)
+ fdbcli_LDFLAGS := $(fdbrpc_LDFLAGS)
+-fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -ldl $(FDB_TLS_LIB)
++fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB)
+ fdbcli_STATIC_LIBS := $(TLS_LIBS)
+ 
+ fdbcli_GENERATED_SOURCES += versions.h
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc
+-  fdbcli_LIBS += -lpthread -lrt
++  fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc -lpthread -lrt -ldl
+ else ifeq ($(PLATFORM),osx)
+   fdbcli_LDFLAGS += -lc++
+ endif
+diff --git a/fdbserver/local.mk b/fdbserver/local.mk
+index 690916d0..475abbaf 100644
+--- a/fdbserver/local.mk
++++ b/fdbserver/local.mk
+@@ -26,8 +26,7 @@ fdbserver_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB
+ fdbserver_STATIC_LIBS := $(TLS_LIBS)
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdbserver_LIBS += -ldl -lpthread -lrt
+-  fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc
++  fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
+ 
+   # GPerfTools profiler (uncomment to use)
+   # fdbserver_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix
index 89f1821981fc..ebade244bdf7 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/gpm/default.nix b/pkgs/servers/gpm/default.nix
index 3cb0d3931db3..7636dca15d8d 100644
--- a/pkgs/servers/gpm/default.nix
+++ b/pkgs/servers/gpm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, automake, autoconf, libtool, flex, bison, texinfo
+{ stdenv, fetchurl, automake, autoconf, libtool, flex, bison, texinfo, fetchpatch
 
 # Optional Dependencies
 , ncurses ? null
@@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
   };
 
   postPatch = ''
-    sed '1i#include <sys/types.h>' -i src/daemon/open_console.c
     substituteInPlace src/prog/gpm-root.y --replace __sigemptyset sigemptyset
   '';
 
@@ -22,6 +21,22 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
+  patches = [
+    # musl compat patches, safe everywhere
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/gentoo/musl/5aed405d87dfa92a5cab1596f898e9dea07169b8/sys-libs/gpm/files/gpm-1.20.7-musl-missing-headers.patch";
+      sha256 = "1g338m6j1sba84wlqp1r6rpabj5nm6ki577hjalg46czg0lfp20h";
+    })
+    # Touches same code as glibc fix in postPatch above, but on the non-glibc route
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/gentoo/musl/5aed405d87dfa92a5cab1596f898e9dea07169b8/sys-libs/gpm/files/gpm-1.20.7-musl-portable-sigaction.patch";
+      sha256 = "0hfdqm9977hd5dpzn05y0a6jbj55w1kp4hd9gyzmg9wslmxni4rg";
+    })
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/gentoo/musl/5aed405d87dfa92a5cab1596f898e9dea07169b8/sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch";
+      sha256 = "0lg4l9phvy2n8gy17qsn6zn0qq52vm8g01pgq5kqpr8sd3fb21c2";
+    })
+  ];
   preConfigure = ''
     ./autogen.sh
   '';
diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix
index fc9d4c0508ed..c4be1f3c3b34 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 dcd81fa44b05..6a33ac638d21 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 493131795034..d921eee49cfc 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/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 9c645d59b2c7..16084ca4ae4f 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.73.1";
+  version = "0.73.2";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 3642fb6b16d6..e37da61958ce 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -68,7 +68,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.73.1";
+  hassVersion = "0.73.2";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -83,7 +83,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "1hcxwsyj15qks2il06dbwk1ycwspz97pgrwydp00qgcraw0yafmp";
+    sha256 = "1hfxwm49hgikdh827jnlzgfz9h51rjz1gm841f5iz1vwz301l6sk";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index dd076606da5b..4822b5109e81 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert http2Support -> nghttp2 != null;
 
 stdenv.mkDerivation rec {
-  version = "2.4.33";
+  version = "2.4.34";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha256 = "de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05";
+    sha256 = "1w1q2smdgf6ln0x741lk5pv5r0gzrxj2iza1vslhifzy65bcjlzs";
   };
 
   # FIXME: -dev depends on -doc
diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix
index 43334819dc56..5a873c7e84b1 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 dbc5c73414cd..fd2dec44c7f3 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 448695930039..643e7ed719a4 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 1f6fcc319435..0910a6d05844 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 33801c8cd326..479c9e41aa91 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 1155bac75703..1fe48e84fac7 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/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 098825d59ce8..8fe34cd6183d 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  common = { versionMajor, versionMinor, sha256 } @ args: stdenv.mkDerivation (rec {
+  common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (rec {
     name = "apache-tomcat-${version}";
     version = "${versionMajor}.${versionMinor}";
 
diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix
new file mode 100644
index 000000000000..22191e199766
--- /dev/null
+++ b/pkgs/servers/hydron/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, ffmpeg-full, graphicsmagick
+, quicktemplate, go-bindata, easyjson }:
+
+buildGoPackage rec {
+  name = "hydron-unstable-${version}";
+  version = "2018-07-15";
+  goPackagePath = "github.com/bakape/hydron";
+  goDeps = ./deps.nix;
+
+  src = fetchFromGitHub {
+    rev = "3906ace0b4cf48ba9acccf372377c7feb0665be4";
+    owner = "bakape";
+    repo = "hydron";
+    sha256 = "079a88740wxgq73sq8w96zppfng7af76k7h484x3w695qk83j33r";
+  };
+
+  enableParallelBuilding = true;
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ ffmpeg-full graphicsmagick quicktemplate go-bindata easyjson ];
+
+  # Temporary workaround for https://github.com/NixOS/nixpkgs/issues/43593
+  preBuild = ''
+    rm go/src/github.com/bakape/hydron/ico.syso
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/bakape/hydron";
+    description = "High performance media tagger and organizer";
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ chiiruno ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/servers/hydron/deps.nix b/pkgs/servers/hydron/deps.nix
new file mode 100644
index 000000000000..9ef0fd23b455
--- /dev/null
+++ b/pkgs/servers/hydron/deps.nix
@@ -0,0 +1,93 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/Masterminds/squirrel";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Masterminds/squirrel";
+      rev = "b127ed9be03443fe3c0877e391130e3dd3f3107a";
+      sha256 = "04vgwm5g5486188656hiw1x56mrkv27s5g2s8mc1lz7z1ig5g5bg";
+    };
+  }
+  {
+    goPackagePath = "github.com/bakape/thumbnailer";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bakape/thumbnailer";
+      rev = "fa88f595f3882773bc425b382eee71e3e2fa1291";
+      sha256 = "19xfn8aj1nhh5dj93hskzrhaa07sayd8agmz1vkkh6varqrldanf";
+    };
+  }
+  {
+    goPackagePath = "github.com/dimfeld/httptreemux";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dimfeld/httptreemux";
+      rev = "7f532489e7739b3d49df5c602bf63549881fe753";
+      sha256 = "0hkw04rsvljvx8ynqjgz9cb743x09fd2xiiycrgz5vbsa8q9iyyk";
+    };
+  }
+  {
+    goPackagePath = "github.com/gorilla/handlers";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/handlers";
+      rev = "13a38d26174b16d5b4bf6f1094c1389ec9879572";
+      sha256 = "0zg43blpyyy667y0kpiifk5a2w35jh8qkk4zwlabb365c0lzrv6v";
+    };
+  }
+  {
+    goPackagePath = "github.com/lann/builder";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lann/builder";
+      rev = "1b87b36280d04fe7882d1512bf038ea2967ad534";
+      sha256 = "015q46awbyp47vld07yi7d27i0lkd82r7qn5230bb9qxl4mcfiqc";
+    };
+  }
+  {
+    goPackagePath = "github.com/lann/ps";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lann/ps";
+      rev = "62de8c46ede02a7675c4c79c84883eb164cb71e3";
+      sha256 = "10yhcyymypvdiiipchsp80jbglk8c4r7lq7h54v9f4mxmvz6xgf7";
+    };
+  }
+  {
+    goPackagePath = "github.com/mailru/easyjson";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mailru/easyjson";
+      rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485";
+      sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-sqlite3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-sqlite3";
+      rev = "3aefd9f0a162514f66d0e4ceda3edc44e66b502e";
+      sha256 = "0as2kqmlvd21r481vxl457n5lxxp4i1jdjkmyqsjf5vg6xr9gd2d";
+    };
+  }
+  {
+    goPackagePath = "github.com/valyala/bytebufferpool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/valyala/bytebufferpool";
+      rev = "e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7";
+      sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93";
+    };
+  }
+  {
+    goPackagePath = "github.com/valyala/quicktemplate";
+    fetch = {
+      type = "git";
+      url = "https://github.com/valyala/quicktemplate";
+      rev = "a91e0946457b6583004fbfc159339b8171423aed";
+      sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc";
+    };
+  }
+]
diff --git a/pkgs/servers/inginious/default.nix b/pkgs/servers/inginious/default.nix
deleted file mode 100644
index fbe226d3e3d3..000000000000
--- a/pkgs/servers/inginious/default.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ pkgs, lib, python2Packages }:
-with lib;
-
-let
-  pythonPackages = python2Packages;
-
-  docker_1_7_2 = pythonPackages.docker.overrideAttrs (oldAttrs: rec {
-    name = "docker-py-1.7.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/docker-py/${name}.tar.gz";
-      sha256 = "0k6hm3vmqh1d3wr9rryyif5n4rzvcffdlb1k4jvzp7g4996d3ccm";
-    };
-  });
-
-  webpy-custom = pythonPackages.web.override {
-    name = "web.py-INGI";
-    src = pkgs.fetchFromGitHub {
-      owner = "UCL-INGI";
-      repo = "webpy-INGI";
-      # tip of branch "ingi"
-      rev = "f487e78d65d6569eb70003e588d5c6ace54c384f";
-      sha256 = "159vwmb8554xk98rw380p3ah170r6gm861r1nqf2l452vvdfxscd";
-    };
-  };
-
-in pythonPackages.buildPythonApplication rec {
-  version = "0.3a2.dev0";
-  name = "inginious-${version}";
-
-  disabled = pythonPackages.isPy3k;
-
-  patchPhase = ''
-    # transient failures
-    substituteInPlace inginious/backend/tests/TestRemoteAgent.py \
-      --replace "test_update_task_directory" "noop"
-  '';
-
-  propagatedBuildInputs = with pythonPackages; [
-    requests
-    cgroup-utils docker_1_7_2 docutils PyLTI mock pygments
-    pymongo pyyaml rpyc sh simpleldap sphinx_rtd_theme tidylib
-    websocket_client watchdog webpy-custom flup
-  ];
-
-  buildInputs = with pythonPackages; [ nose selenium virtual-display ];
-
-  /* Hydra fix exists only on github for now.
-  src = pkgs.fetchurl {
-    url = "mirror://pypi/I/INGInious/INGInious-${version}.tar.gz";
-  };
-  */
-  src = pkgs.fetchFromGitHub {
-    owner = "UCL-INGI";
-    repo = "INGInious";
-    rev = "07d111c0a3045c7cc4e464d4adb8aa28b75a6948";
-    sha256 = "0kldbkc9yw1mgg5w5q5v8k2hz089c5c4rvxb5xhbagkzgm2gn230";
-  };
-
-  # Only patch shebangs in /bin, other scripts are run within docker
-  # containers and will fail if patched.
-  dontPatchShebangs = true;
-  preFixup = ''
-    patchShebangs $prefix/bin
-  '';
-
-  meta = {
-    broken = true;
-    description = "An intelligent grader that allows secured and automated testing of code made by students";
-    homepage = https://github.com/UCL-INGI/INGInious;
-    license = licenses.agpl3;
-    maintainers = with maintainers; [ layus ];
-  };
-}
diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix
index 0df055f9690f..f57c94cd1084 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 5aafe55512be..9e8a9dc9ec60 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 6826df5f6e86..4276a51715a6 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/livepeer/default.nix b/pkgs/servers/livepeer/default.nix
index 105223f31a5b..2e17001abc50 100644
--- a/pkgs/servers/livepeer/default.nix
+++ b/pkgs/servers/livepeer/default.nix
@@ -27,7 +27,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Official Go implementation of the Livepeer protocol";
-    homepage = http://livepeer.org;
+    homepage = https://livepeer.org;
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ elitak ];
diff --git a/pkgs/servers/mail/dkimproxy/default.nix b/pkgs/servers/mail/dkimproxy/default.nix
index 9abf95fb6d60..2912ce4cfcaa 100644
--- a/pkgs/servers/mail/dkimproxy/default.nix
+++ b/pkgs/servers/mail/dkimproxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, perl, fetchurl, Error, MailDKIM, MIMEtools, NetServer }:
+{ stdenv, perl, fetchurl, Error, MailDKIM, MIMETools, NetServer }:
 
 let
   pkg = "dkimproxy";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ perl ];
-  propagatedBuildInputs = [ Error MailDKIM MIMEtools NetServer ];
+  propagatedBuildInputs = [ Error MailDKIM MIMETools NetServer ];
 
   meta = with stdenv.lib; {
     description = "SMTP-proxy that signs and/or verifies emails";
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index e676246a08ec..5a9d8e61b1fe 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/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix
index b63390bb2474..8fa7719a722b 100644
--- a/pkgs/servers/mail/dspam/default.nix
+++ b/pkgs/servers/mail/dspam/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, makeWrapper
 , gawk, gnused, gnugrep, coreutils, which
-, perl, NetSMTP
+, perl, libnet
 , withMySQL ? false, zlib, mysql57
 , withPgSQL ? false, postgresql
 , withSQLite ? false, sqlite
@@ -62,7 +62,7 @@ in stdenv.mkDerivation rec {
     rm -rf $out/var
 
     wrapProgram $out/bin/dspam_notify \
-      --set PERL5LIB "${lib.makePerlPath [ NetSMTP ]}"
+      --set PERL5LIB "${lib.makePerlPath [ libnet ]}"
 
     # Install SQL scripts
     mkdir -p $out/share/dspam/sql
diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix
index f11400c190af..98b270ad7d41 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 302aa8d55932..8c86cc6577a7 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/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index 305ee174bf3c..0654da927769 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }:
 
 let
-  version = "5.0.0";
+  version = "5.1.0";
 
   mattermost-server = buildGoPackage rec {
     name = "mattermost-server-${version}";
@@ -10,7 +10,7 @@ let
       owner = "mattermost";
       repo = "mattermost-server";
       rev = "v${version}";
-      sha256 = "12wiw8k5is78ppazrf26y2xq73kwbafa9w75wjnb1839v2k9sark";
+      sha256 = "069ihmfr6np991mbgg001y0kyafghn57nsv3kpyyvfmhv07p0qbc";
     };
 
     goPackagePath = "github.com/mattermost/mattermost-server";
@@ -27,7 +27,7 @@ let
 
     src = fetchurl {
       url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
-      sha256 = "1pal65di6w9idf3rwxh77la1v816h8kama1ilkbs40cpp2vazw3b";
+      sha256 = "1bm5nqnhk2w3sy8mvm81k7d65j6bgpvakgphgwqgnlm864i4253z";
     };
 
     installPhase = ''
diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix
index 53c87745e67a..fe1f1c6760d8 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 98ac1534cf8a..10c8811c548f 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 0480d056c592..0e256d907dc2 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 646a7856788b..a888549bb6aa 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 34b4e87bf65c..d9e8ccf1454f 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
 }:
 
@@ -49,7 +49,7 @@ buildPerlPackage rec {
     IOSocketSSL
     IPCRun
     JSON
-    LWPProtocolhttps
+    LWPProtocolHttps
     ModuleInstall
     NetSNMP
     TestCompile
diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix
index 409801e8b7dc..0e21069bbb0e 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 859849f7b2c7..af5f2880a0f8 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/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix
index dcc6f6f16b7f..45e380379d2f 100644
--- a/pkgs/servers/monitoring/longview/default.nix
+++ b/pkgs/servers/monitoring/longview/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ perl makeWrapper glibc ]
     ++ (with perlPackages; [
-      LWPUserAgent
+      LWP
       LWPProtocolHttps
       MozillaCA
       CryptSSLeay
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 62fc3c6f8f55..8bf9da22e728 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "10niyzckx90dwdr4d7vj07d1qjy3nk7xzp30nqnlxzbaww7n5v78";
   };
 
-  buildInputs = [ 
+  buildInputs = [
     makeWrapper
     which
     coreutils
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     perlPackages.NetCIDR
     perlPackages.NetSSLeay
     perlPackages.NetServer
-    perlPackages.Log4Perl
+    perlPackages.LogLog4perl
     perlPackages.IOSocketInet6
     perlPackages.Socket6
     perlPackages.URI
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     perlPackages.NetServer
     perlPackages.ListMoreUtils
     perlPackages.TimeHiRes
-    perlPackages.LWPUserAgent
+    perlPackages.LWP
     perlPackages.DBDPg
     python
     ruby
@@ -116,9 +116,9 @@ stdenv.mkDerivation rec {
         esac
         wrapProgram "$file" \
           --set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; stdenv.lib.makePerlPath [
-                Log4Perl IOSocketInet6 Socket6 URI DBFile DateManip
+                LogLog4perl IOSocketInet6 Socket6 URI DBFile DateManip
                 HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer
-                ListMoreUtils TimeHiRes DBDPg LWPUserAgent rrdtool
+                ListMoreUtils TimeHiRes DBDPg LWP rrdtool
                 ]}"
     done
   '';
diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix
index 957aee43691a..5d93f4c53496 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 798f31c3458e..1f342adebaa0 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 2bd9b6af0748..0d6fbac60e5d 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 2e7a4932de62..1271b3d40e14 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 ea17c0b18b23..ffba472bdc33 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 42ff2496df12..ade9bb87d993 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 59314f1f282a..8b6c54d41f91 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 788fe8633967..5e4ebb581400 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 9692354ad8a8..29454dd44d2b 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 f4d9f5a85037..e5480e020372 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 13e17d0b0192..0c5cc6267659 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 44a670b95ab4..18fa3f98db23 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 d83aa5b46658..b23270cd8c1e 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 d3816cf1ecdb..9f1a2baeb9ac 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 bc5556d4bc00..bf3849e6524b 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 69b3577720f5..047ce0a5130e 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 35637e7f73ac..f8523e8607d3 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 0121d748129b..3d6a1aa9c6fa 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 347af1c4de9f..f3d3fed23a41 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchFromGitHub
-, openssl, zlib, python2Packages, readline, cmake, python }:
+, openssl, zlib, readline, cmake, python }:
 
 let
 in stdenv.mkDerivation rec {
-  version = "3.3.11";
+  version = "3.3.12";
   name    = "arangodb-${version}";
 
   src = fetchFromGitHub {
     repo = "arangodb";
     owner = "arangodb";
     rev = "v${version}";
-    sha256 = "0x1sq2gvag7adba5nsx913dax2b2259h73623r0b7gn4v01ivq21";
+    sha256 = "18mx7bcxll1za91q090g3hps3mwrlqdg40lvs61kibci3amma7j2";
   };
 
   buildInputs = [
diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index f97a3a5c1842..1d3240fae716 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 b9e850e8dfd4..c62ade1a20bb 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 e935b5d09879..d6ee407e3418 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 9075756c1621..cf807e70596d 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 a064049072c9..1524ca207009 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 e4c9b90ab145..b041aa9f35fc 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 fa78c876c1ec..d48587c924e7 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 3f92299c2a0a..22f09994ebf0 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.6/module.nix b/pkgs/servers/openafs/1.6/module.nix
index 8cd9287a7772..bf4f36bb250b 100644
--- a/pkgs/servers/openafs/1.6/module.nix
+++ b/pkgs/servers/openafs/1.6/module.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, which, autoconf, automake, flex, yacc
+{ stdenv, fetchurl, which, autoconf, automake, flex, bison
 , kernel, glibc, perl }:
 
 with (import ./srcs.nix { inherit fetchurl; });
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   name = "openafs-${version}-${kernel.version}";
   inherit version src;
 
-  nativeBuildInputs = [ autoconf automake flex perl yacc which ] ++ kernel.moduleBuildDependencies;
+  nativeBuildInputs = [ autoconf automake flex perl bison which ] ++ kernel.moduleBuildDependencies;
 
   hardeningDisable = [ "pic" ];
 
diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix
index 59c15839b393..fc6b1bc2426b 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/openxpki/default.nix b/pkgs/servers/openxpki/default.nix
index e8f36fa033e2..f68e1f5e9816 100644
--- a/pkgs/servers/openxpki/default.nix
+++ b/pkgs/servers/openxpki/default.nix
@@ -14,19 +14,19 @@ buildPerlPackage {
   buildInputs = [ perl openssl gettext python34Packages.sphinx ];
   propagatedBuildInputs = with perlPackages;
     [ # dependencies from Makefile.PL
-      libintlperl ConfigVersioned LWP TestSimple ClassAccessorChained IOSocketSSL ClassStd
+      libintl_perl ConfigVersioned LWP ClassAccessorChained IOSocketSSL ClassStd
       CGISession ConfigStd ConfigMerge Connector CryptCBC CryptOpenSSLAES CryptPKCS10
       DBDMock DataPassword DataSerializer DateTimeFormatDateParse IOPrompt
-      IPCShareLite JSON Log4Perl LWPProtocolconnect LWPProtocolhttps MailRFC822Address
-      Moose NetAddrIP NetDNS NetIP NetLDAP NetHTTP NetServer NetSSLeay ParamsValidate PathClass
+      IPCShareLite JSON LogLog4perl LWPProtocolConnect LWPProtocolHttps MailRFC822Address
+      Moose NetAddrIP NetDNS NetIP perlldap NetHTTP NetServer NetSSLeay ParamsValidate PathClass
       ProcProcessTable ProcSafeExec RegexpCommon SOAPLite Switch SysSigAction TemplateToolkit
       TestPod TestPodCoverage TextCSV_XS TimeHiRes Workflow XMLFilterXInclude XMLParser
       XMLSAX XMLSAXWriter XMLSimple XMLValidatorSchema ]
     ++ stdenv.lib.optionals extraDependencies1
     [ # dependencies from parsing through core/server
       ClassAccessor Carp PathTools DataDumper DateTime DateTimeFormatStrptime DBI DigestMD5
-      DigestSHA Encode ExceptionClass Exporter FilePath FileTemp Filter GetoptLong HTMLParser
-      ScalarListUtils MathBigInt Memoize MIMEBase64 NetSMTP PodUsage RTClientREST Socket
+      Encode ExceptionClass Exporter FilePath FileTemp Filter GetoptLong HTMLParser
+      ScalarListUtils MathBigInt Memoize libnet PodUsage RTClientREST Socket
       Storable XSLoader ]
     ++ stdenv.lib.optionals extraDependencies2
     [ # dependencies taken from Debian
@@ -38,7 +38,7 @@ buildPerlPackage {
       AttributeHandlers AttributeParamsValidate AutoLoader BC CGI CPAN CacheCache ClassClassgenclassgen
       ClassContainer ClassDataInheritable ClassSingleton ConvertASN1 DBDSQLite DBIxHTMLViewLATEST
       DBFile DataPage DataSpreadPagination DateTimeLocale DateTimeTimeZone DevelPPPort DevelSelfStubber
-      DevelSymdump Digest DigestSHA1 Env Error ExtUtilsCommand ExtUtilsConstant ExtUtilsInstall
+      DevelSymdump DigestSHA1 Env Error ExtUtilsCommand ExtUtilsConstant ExtUtilsInstall
       ExtUtilsMakeMaker FileCheckTree FilterSimple GoferTransporthttp HTMLMason HTMLTagset
       HTTPServerSimpleMason I18NCollate IO IPCSysV LocaleCodes LocaleMaketext LogDispatch MathBigRat
       MathComplex MathRound ModuleBuild ModuleBuildDeprecated NetPing PerlIOviaQuotedPrint PodChecker
diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix
index f02e67740b62..14a4a2868f0e 100644
--- a/pkgs/servers/owncloud/default.nix
+++ b/pkgs/servers/owncloud/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 let
-  common = { versiona, sha256 } @ args: stdenv.mkDerivation (rec {
+  common = { versiona, sha256 }: stdenv.mkDerivation (rec {
 
     name= "owncloud-${version}";
     version= versiona;
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index ed4a8889c67d..73af65ef2561 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 230e0aee2181..04d520b412c1 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 6f5bb1d3a71f..87f4326c48c3 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 0ff7f88911f2..eec80cb66bcc 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 df1f9feb4de5..21038a0f2183 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 ade2ea944534..b93d8c2203d7 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 ccb174371e0c..7bfea23c78b5 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/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index c9bf8393afc7..523292f6b0f4 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -45,8 +45,8 @@ buildPerlPackage rec {
     perlPackages.IOSocketSSL
     perlPackages.IOString
     perlPackages.JSONXSVersionOneAndTwo
-    perlPackages.Log4Perl
-    perlPackages.LWPUserAgent
+    perlPackages.LogLog4perl
+    perlPackages.LWP
     perlPackages.NetHTTP
     perlPackages.ProcBackground
     perlPackages.SubName
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 126a8cf0690e..121e42f7a978 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/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 5d348c129437..a727b60dd9d4 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  common = { version, sha256, psqlSchema } @ args:
+  common = { version, sha256, psqlSchema }:
    let atLeast = lib.versionAtLeast version; in stdenv.mkDerivation (rec {
     name = "postgresql-${version}";
 
@@ -95,33 +95,33 @@ let
 in {
 
   postgresql93 = common {
-    version = "9.3.22";
+    version = "9.3.23";
     psqlSchema = "9.3";
-    sha256 = "06p9rk2bav41ybp8ra1bpf44avw9kl5s1wyql21n5awvlm5fs60v";
+    sha256 = "1jzncs7b6zrcgpnqjbjcc4y8303a96zqi3h31d3ix1g3vh31160x";
   };
 
   postgresql94 = common {
-    version = "9.4.17";
+    version = "9.4.18";
     psqlSchema = "9.4";
-    sha256 = "1inpkwbr2xappz3kq3jr3hsn6mwn167nijcx406q8aq56p9hqcks";
+    sha256 = "1h64yjyrlz3ppsp9k6sm4jihg6n9i7mqhkx4p0hymqzmnbr3g0s2";
   };
 
   postgresql95 = common {
-    version = "9.5.12";
+    version = "9.5.13";
     psqlSchema = "9.5";
-    sha256 = "167nlrpsnqz63gafgn21j4yc2f5g1mpfkz8qxjxk2xs6crf6zs02";
+    sha256 = "1vm55q9apja6lg672m9xl1zq3iwv2zwnn0d0qr003zan1dmbh22l";
   };
 
   postgresql96 = common {
-    version = "9.6.8";
+    version = "9.6.9";
     psqlSchema = "9.6";
-    sha256 = "0w7bwf19wbdd3jjbjv03cnx56qka4801srcbsayk9v792awv7zga";
+    sha256 = "0biy8j69dbvdmrag55pdszpc0702agzqhhcwdx21xp02mzim4ydr";
   };
 
   postgresql100 = common {
-    version = "10.3";
+    version = "10.4";
     psqlSchema = "10.0";
-    sha256 = "06lkcwsf851z49zqcws5yc77s2yrbaazf2nvbk38hpp31rw6i8kf";
+    sha256 = "0j000bcs9w8wrllg8m7j1lxsd3n2x0yzkack5p35cmxx20iq2q0v";
   };
 
 }
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index f45ee7500ed0..2438c49d9cb9 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -8,18 +8,6 @@ let
   malloc0ReturnsNullCrossFlag = stdenv.lib.optional
     (stdenv.hostPlatform != stdenv.buildPlatform)
     "--enable-malloc0returnsnull";
-
-  gitRelease = { libName, version, rev, sha256 } : attrs : attrs // {
-    name = libName + "-" + version;
-    src = args.fetchgit {
-      url = git://anongit.freedesktop.org/xorg/lib/ + libName;
-      inherit rev sha256;
-    };
-    buildInputs = attrs.buildInputs ++ [ xorg.utilmacros  ];
-    preConfigure = (attrs.preConfigure or "") + "\n./autogen.sh";
-  };
-
-  compose = f: g: x: f (g x);
 in
 {
   bdftopcf = attrs: attrs // {
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix
index 9c133f9d5d99..3fc7aaea9c93 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"
 }: