Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1508887

21 files changed, 224 insertions, 177 deletions

diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index 7e0bf298b02..7fdbfb6472c 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -46,18 +46,18 @@ in
 
 {
   bird = generic {
-    version = "1.6.3";
-    sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r";
+    version = "1.6.6";
+    sha256 = "0w1dmwx89g3qdy92wkjl3p52rn521izm2m8yq74hs7myxxx3nnwp";
   };
 
   bird6 = generic {
-    version = "1.6.3";
-    sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r";
+    version = "1.6.6";
+    sha256 = "0w1dmwx89g3qdy92wkjl3p52rn521izm2m8yq74hs7myxxx3nnwp";
     enableIPv6 = true;
   };
 
   bird2 = generic {
-    version = "2.0.2";
-    sha256 = "03s8hcl761y3489j1krarm3r3iy5qid26508i91yvy38ypb92pq3";
+    version = "2.0.4";
+    sha256 = "1phl8ycasbzgla83d9zbzzy1ymjz30k1qh1pmywmjhbxa6vi0q37";
   };
 }
diff --git a/pkgs/servers/bird/dont-create-sysconfdir-1.patch b/pkgs/servers/bird/dont-create-sysconfdir-1.patch
index 0a11c8a2a8d..8f62670aee9 100644
--- a/pkgs/servers/bird/dont-create-sysconfdir-1.patch
+++ b/pkgs/servers/bird/dont-create-sysconfdir-1.patch
@@ -1,13 +1,6 @@
-diff --git a/tools/Makefile.in b/tools/Makefile.in
-index 062ba91..4fd7453 100644
 --- a/tools/Makefile.in
 +++ b/tools/Makefile.in
-@@ -68,7 +68,7 @@ tags:
- 	cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
- 
+@@ -68,2 +68,2 @@
  install: all
--	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@
+-	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(runstatedir)
 +	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir)
- 	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX@
- 	$(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl@SUFFIX@
- 	if test -n "@CLIENT@" ; then								\
diff --git a/pkgs/servers/bird/dont-create-sysconfdir-2.patch b/pkgs/servers/bird/dont-create-sysconfdir-2.patch
index fd86da8a129..24716446118 100644
--- a/pkgs/servers/bird/dont-create-sysconfdir-2.patch
+++ b/pkgs/servers/bird/dont-create-sysconfdir-2.patch
@@ -1,13 +1,6 @@
-diff --git a/Makefile.in b/Makefile.in
-index fdd5e6c..45f81a1 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -165,7 +165,7 @@ tags:
- # Install
- 
+@@ -165,2 +165,2 @@
  install: all
--	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@
+-	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(runstatedir)
 +	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir)
- 	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird
- 	$(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl
- 	if test -n "@CLIENT@" ; then								\
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index 38d79eb2ba4..7fc2f8779f6 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "consul-${version}";
-  version = "1.4.1";
+  version = "1.4.2";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/consul";
@@ -19,7 +19,7 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "consul";
     inherit rev;
-    sha256 = "1xd2chx69jdbq2r82d4cgyc8pf1cmmxqvbfz29bf3nvvi6bgq7d5";
+    sha256 = "1nprl9kcb98ikcmk7safji3hl4kfacx0gnh05k8m4ysfz6mr7zri";
   };
 
   preBuild = ''
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 659f8d5dea4..fd5e79b6efb 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   name = "knot-dns-${version}";
-  version = "2.7.6";
+  version = "2.8.0";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "a1cb1877f04f7c2549c977c2658cfafd07c7e0e924f8e8aa8d4ae4b707f697a2";
+    sha256 = "494ad926705018bd754d96711dc2129f3173f326a0b57d33978090ba4eef87ef";
   };
 
   outputs = [ "bin" "out" "dev" ];
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 04d0a0cf8d0..3882db1124a 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, runCommand, pkgconfig, hexdump, which
+{ stdenv, fetchurl, fetchpatch, runCommand, pkgconfig, hexdump, which
 , knot-dns, luajit, libuv, lmdb, gnutls, nettle
 , cmocka, systemd, dns-root-data, makeWrapper
 , extraFeatures ? false /* catch-all if defaults aren't enough */
@@ -19,6 +19,14 @@ unwrapped = stdenv.mkDerivation rec {
     sha256 = "d1396888ec3a63f19dccdf2b7dbcb0d16a5d8642766824b47f4c21be90ce362b";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "support-libzscanner-2.8.diff";
+      url = "https://gitlab.labs.nic.cz/knot/knot-resolver/commit/186f263.diff";
+      sha256 = "19zqigvc7m2a4j6bk9whx7gj0v009568rz5qwk052z7pzfikr8mk";
+    })
+  ];
+
   # Short-lived cross fix, as upstream is migrating to meson anyway.
   postPatch = ''
     substituteInPlace platform.mk --replace "objdump" "$OBJDUMP"
diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
index 64758962102..ff767d9ad43 100644
--- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
@@ -1,20 +1,23 @@
 { stdenv, fetchurl, apacheHttpd }:
 
-stdenv.mkDerivation rec {
-  name = "mod_fastcgi-2.4.6";
+let
+  version = "2.4.7.1";
+
+  apache-24-patch = fetchurl {
+      name = "compile-against-apache24.diff";
+      url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42";
+      sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4";
+    };
+in
+stdenv.mkDerivation {
+  name = "mod_fastcgi-${version}";
 
   src = fetchurl {
-    url = "http://www.fastcgi.com/dist/${name}.tar.gz";
+    url = "https://github.com/FastCGI-Archives/mod_fastcgi/archive/${version}.tar.gz";
     sha256 = "12g6vcfl9jl8rqf8lzrkdxg2ngca310d3d6an563xqcgrkp8ga55";
   };
 
-  patches =
-    [ (fetchurl {
-        name = "compile-against-apache24.diff";
-        url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42";
-        sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4";
-      })
-    ];
+  patches = [ apache-24-patch ];
 
   buildInputs = [ apacheHttpd ];
 
@@ -24,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.fastcgi.com/;
+    homepage = https://github.com/FastCGI-Archives/mod_fastcgi;
     description = "Provide support for the FastCGI protocol";
 
     longDescription = ''
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 0b9e43f4c31..a4940850cc5 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jackett-${version}";
-  version = "0.10.707";
+  version = "0.10.846";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "0ks5jsfdwhkr8mr5q73yhv4q6bpab15my4iq1163ad5lcb1981r1";
+    sha256 = "1y1hqa7w04zs6lhyg8624b5iv8l0ni4v887mckaqqp312xmhniq7";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix
index 431e66e38fb..094b782abf9 100644
--- a/pkgs/servers/mail/spamassassin/default.nix
+++ b/pkgs/servers/mail/spamassassin/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perlPackages, makeWrapper, gnupg1 }:
 
 perlPackages.buildPerlPackage rec {
-  name = "SpamAssassin-3.4.1";
+  name = "SpamAssassin-3.4.2";
 
   src = fetchurl {
     url = "mirror://apache/spamassassin/source/Mail-${name}.tar.bz2";
-    sha256 = "0la6s5ilamf9129kyjckcma8cr6fpb6b5f2fb64v7106iy0ckhd0";
+    sha256 = "1np8h293bzg33i0xn9gj9krwgr7k6xbyf1yhxr2j2xci95d080yg";
   };
 
   # https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7434
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 721f4a04302..bda717b2afb 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "6.0.0";
+  version = "6.0.1";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -11,12 +11,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "1dacji3b8iqfx92cb6psrhvg2hym8xl1lzfn7yvyss4vjj7pmbbc";
+    sha256 = "0dh4yjcg0spv8g0xqxaljwix6yh98lnkd2fwv6rgw5w84j95h9br";
   };
 
   srcStatic = fetchurl {
     url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "02c7klma5zl1mcis7gnbfi56i59ps7i757yyy8v9gnp5ynnb55v4";
+    sha256 = "0kfi9v0w43nwci575xph3lxa96w8li50jsa1n9pjvz31cjs7hyy2";
   };
 
   postPatch = ''
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix
index 6509f55d46e..4c6cc694243 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix
@@ -1,8 +1,8 @@
-{ stdenv, go, buildGoPackage, go-bindata, fetchFromGitHub }:
+{ stdenv, go, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "pushgateway-${version}";
-  version = "0.4.0";
+  version = "0.7.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/pushgateway";
@@ -11,33 +11,39 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "pushgateway";
-    sha256 = "19hsv42addcx4dsjdbh64y7ggjvaaay9gag0342gz7gyl9sr719f";
+    sha256 = "1sczg6vrpxv0jlqhkif8443v7mhbp3lp40g71ndqkf1s669m1pl4";
   };
 
-  buildInputs = [ go-bindata ];
-
-  preBuild = ''
-  (
-    cd "go/src/$goPackagePath"
-    go-bindata ./resources/
-  )
-  '';
+  buildUser = "nix@nixpkgs";
+  buildDate = "19700101-00:00:00";
 
   buildFlagsArray = ''
     -ldflags=
-        -X main.buildVersion=${version}
-        -X main.buildRev=${rev}
-        -X main.buildBranch=${rev}
-        -X main.buildUser=nix@nixpkgs
-        -X main.buildDate=19700101-00:00:00
+        -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Version=${version}
+        -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Revision=${rev}
+        -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Branch=${rev}
+        -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildUser=${buildUser}
+        -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildDate=${buildDate}
         -X main.goVersion=${stdenv.lib.getVersion go}
   '';
 
+  doInstallCheck = true;
+  installCheckPhase = ''
+    export PATH=$PATH:$bin/bin
+
+    pushgateway --help
+
+    # Make sure our -X options were included in the build
+    for s in ${version} ${rev} ${buildUser} ${buildDate}; do
+      pushgateway --version 2>&1 | fgrep -q -- "$s" || { echo "pushgateway --version output missing $s"; exit 1; }
+    done
+  '';
+
   meta = with stdenv.lib; {
     description = "Allows ephemeral and batch jobs to expose metrics to Prometheus";
     homepage = https://github.com/prometheus/pushgateway;
     license = licenses.asl20;
-    maintainers = with maintainers; [ benley fpletz ];
+    maintainers = with maintainers; [ benley fpletz ivan ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix
index c133161cf57..6f771e2bf33 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, bison
+{ stdenv, fetchurl, fetchpatch, which, autoconf, automake, flex, bison
 , kernel, glibc, perl }:
 
 with (import ./srcs.nix { inherit fetchurl; });
@@ -11,6 +11,25 @@ in stdenv.mkDerivation rec {
   name = "openafs-${version}-${kernel.modDirVersion}";
   inherit version src;
 
+  patches = [
+    # Linux 4.20
+    (fetchpatch {
+      name = "openafs_1_6-current_kernel_time.patch";
+      url = "http://git.openafs.org/?p=openafs.git;a=patch;h=b9936e944a2b4f5773d66864cbb297993b050e65";
+      sha256 = "16fl9kp0l95dqm166jx3x4ijbzhf2bc9ilnipn3k1j00mfy4lnia";
+    })
+    (fetchpatch {
+      name = "openafs_1_6-do_settimeofday.patch";
+      url = "http://git.openafs.org/?p=openafs.git;a=patch;h=fe6fb38b3d4095351955b9872d0fd6cba64f8784";
+      sha256 = "0k6kgk1ybhm9xx2l0wbcyv7jimkr9mfs2ywvxy8hpyhcm7rbwjkp";
+    })
+    # Linux 5.0
+    (fetchpatch {
+      name = "openafs_1_6-super_block.patch";
+      url = "http://git.openafs.org/?p=openafs.git;a=patch;h=61db15f1badabd83e289efd622e274c47f0aefda";
+      sha256 = "0cdd76s1h1bhxj0hl7r6mcha1jcy5vhlvc5dc8m2i83a6281yjsa";
+    })
+  ];
   nativeBuildInputs = [ autoconf automake flex perl bison which ] ++ kernel.moduleBuildDependencies;
 
   hardeningDisable = [ "pic" ];
@@ -51,7 +70,7 @@ in stdenv.mkDerivation rec {
     license = licenses.ipl10;
     platforms = platforms.linux;
     maintainers = [ maintainers.z77z maintainers.spacefrogg ];
-    broken = versionOlder kernel.version "3.18"
+    broken = versionOlder kernel.version "3.18" || builtins.compareVersions kernel.version "5.0" >= 0
              || stdenv.targetPlatform.isAarch64;
   };
 
diff --git a/pkgs/servers/openafs/1.8/linux-4.20.patch b/pkgs/servers/openafs/1.8/linux-4.20.patch
deleted file mode 100644
index bb896d82b69..00000000000
--- a/pkgs/servers/openafs/1.8/linux-4.20.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/src/afs/LINUX/osi_machdep.h
-+++ b/src/afs/LINUX/osi_machdep.h
-@@ -75,7 +75,14 @@
- #if defined(HAVE_LINUX_CRED_H)
- #include "h/cred.h"
- #endif
--#if defined(HAVE_LINUX_CURRENT_KERNEL_TIME)
-+
-+#if defined(HAVE_LINUX_KTIME_GET_COARSE_REAL_TS64)
-+static inline time_t osi_Time(void) {
-+    struct timespec64 xtime;
-+    ktime_get_coarse_real_ts64(&xtime);
-+    return xtime.tv_sec;
-+}
-+#elif defined(HAVE_LINUX_CURRENT_KERNEL_TIME)
- static inline time_t osi_Time(void) {
-     struct timespec xtime;
-     xtime = current_kernel_time();
---- a/src/cf/linux-kernel-func.m4
-+++ b/src/cf/linux-kernel-func.m4
-@@ -72,6 +72,10 @@ AC_CHECK_LINUX_FUNC([iter_file_splice_write],
- AC_CHECK_LINUX_FUNC([kernel_setsockopt],
-                     [#include <linux/net.h>],
-                     [kernel_setsockopt(NULL, 0, 0, NULL, 0);])
-+AC_CHECK_LINUX_FUNC([ktime_get_coarse_real_ts64],
-+                    [#include <linux/time.h>],
-+                    [struct timespec64 *s;
-+                    ktime_get_coarse_real_ts64(s);])
- AC_CHECK_LINUX_FUNC([locks_lock_file_wait],
-                     [#include <linux/fs.h>],
-                     [locks_lock_file_wait(NULL, NULL);])
---- a/src/afs/LINUX/osi_misc.c
-+++ b/src/afs/LINUX/osi_misc.c
-@@ -28,18 +28,6 @@
- int afs_osicred_initialized = 0;
- afs_ucred_t afs_osi_cred;
- 
--void
--afs_osi_SetTime(osi_timeval_t * tvp)
--{
--    struct timespec tv;
--    tv.tv_sec = tvp->tv_sec;
--    tv.tv_nsec = tvp->tv_usec * NSEC_PER_USEC;
--
--    AFS_STATCNT(osi_SetTime);
--
--    do_settimeofday(&tv);
--}
--
- void
- osi_linux_mask(void)
- {
---- a/src/afs/LINUX/osi_prototypes.h
-+++ b/src/afs/LINUX/osi_prototypes.h
-@@ -45,7 +45,6 @@ extern void osi_ioctl_init(void);
- extern void osi_ioctl_clean(void);
- 
- /* osi_misc.c */
--extern void afs_osi_SetTime(osi_timeval_t * tvp);
- extern int osi_lookupname_internal(char *aname, int followlink,
- 				   struct vfsmount **mnt, struct dentry **dpp);
- extern int osi_lookupname(char *aname, uio_seg_t seg, int followlink,
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index 36a73bf5878..38305a11bcc 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, which, autoconf, automake, flex, yacc
+{ stdenv, fetchurl, fetchpatch, which, autoconf, automake, flex, yacc
 , kernel, glibc, perl, libtool_2, kerberos }:
 
 with (import ./srcs.nix { inherit fetchurl; });
@@ -11,7 +11,35 @@ in stdenv.mkDerivation rec {
   name = "openafs-${version}-${kernel.modDirVersion}";
   inherit version src;
 
-  patches = [ ./linux-4.20.patch ];
+  patches = [
+    # Linux 4.20
+    (fetchpatch {
+      name = "openafs_1_8-do_settimeofday.patch";
+      url = "http://git.openafs.org/?p=openafs.git;a=patch;h=aa80f892ec39e2984818090a6bb2047430836ee2";
+      sha256 = "11zw676zqi9sj3vhp7n7ndxcxhp17cq9g2g41n030mcd3ap4g53h";
+    })
+    (fetchpatch {
+      name = "openafs_1_8-current_kernel_time.patch";
+      url = "http://git.openafs.org/?p=openafs.git;a=patch;h=3c454b39d04f4886536267c211171dae30dc0344";
+      sha256 = "16fl9kp0l95dqm166jx3x4ijbzhf2bc9ilnipn3k1j00mfy4lnia";
+    })
+    # Linux 5.0
+    (fetchpatch {
+      name = "openafs_1_8-ktime_get_coarse_real_ts64.patch";
+      url = "http://git.openafs.org/?p=openafs.git;a=patch;h=21ad6a0c826c150c4227ece50554101641ab4626";
+      sha256 = "0cd2bzfn4gkb68qf27wpgcg9kvaky7kll22b8p2vmw5x4xkckq2y";
+    })
+    (fetchpatch {
+      name = "openafs_1_8-ktime_get_real_ts64.patch";
+      url = "http://git.openafs.org/?p=openafs.git;a=patch;h=b892fb127815bdf72103ae41ee70aadd87931b0c";
+      sha256 = "1xmf2l4g5nb9rhca7zn0swynvq8f9pd0k9drsx9bpnwp662y9l8m";
+    })
+    (fetchpatch {
+      name = "openafs_1_8-super_block.patch";
+      url = "http://git.openafs.org/?p=openafs.git;a=patch;h=3969bbca6017eb0ce6e1c3099b135f210403f661";
+      sha256 = "0cdd76s1h1bhxj0hl7r6mcha1jcy5vhlvc5dc8m2i83a6281yjsa";
+    })
+  ];
 
   nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ]
     ++ kernel.moduleBuildDependencies;
diff --git a/pkgs/servers/plexpy/default.nix b/pkgs/servers/plexpy/default.nix
deleted file mode 100644
index 2875ecc5240..00000000000
--- a/pkgs/servers/plexpy/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{stdenv, fetchFromGitHub, python}:
-
-stdenv.mkDerivation rec {
-  version = "1.4.25";
-  pname = "plexpy";
-  name = "${pname}-${version}";
-
-  src = fetchFromGitHub {
-    owner = "JonnyWong16";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "0a4ynrfamlwkgqil4n61v47p21czxpjdzg0mias4kdjam2nnwnjx";
-  };
-
-  buildPhase = ":";
-
-  installPhase = ''
-    mkdir -p $out
-    cp -R * $out/
-
-    # Remove superfluous Python checks from main script;
-    # prepend shebang
-    echo "#!${python.interpreter}" > $out/PlexPy.py
-    tail -n +7 PlexPy.py >> $out/PlexPy.py
-
-    mkdir $out/bin
-    # Can't just symlink to the main script, since it uses __file__ to
-    # import bundled packages and manage the service
-    echo "#!/bin/bash" > $out/bin/plexpy
-    echo "$out/PlexPy.py \$*" >> $out/bin/plexpy
-    chmod +x $out/bin/plexpy
-  '';
-
-  meta  = with stdenv.lib; {
-    description = "A Python based monitoring and tracking tool for Plex Media Server.";
-    homepage = http://jonnywong16.github.io/plexpy/;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ csingley ];
-  };
-}
diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix
new file mode 100644
index 00000000000..5dcd958b799
--- /dev/null
+++ b/pkgs/servers/tautulli/default.nix
@@ -0,0 +1,55 @@
+{stdenv, fetchFromGitHub, python }:
+
+stdenv.mkDerivation rec {
+  version = "2.1.26";
+  pname = "Tautulli";
+  name = "${pname}-${version}";
+
+  pythonPath = [ python.pkgs.setuptools ];
+  buildInputs = [ python.pkgs.setuptools ];
+  nativeBuildInputs = [ python.pkgs.wrapPython ];
+
+  src = fetchFromGitHub {
+    owner = "Tautulli";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1gq13dazbqbzdb0wfw87maprr9nva357zdj8x0lfrbasi3h5522q";
+  };
+
+  buildPhase = ":";
+
+  installPhase = ''
+    mkdir -p $out
+    cp -R * $out/
+
+    # Remove the PlexPy.py compatibility file as it won't work after wrapping.
+    # We still have the plexpy executable in bin for compatibility.
+    rm $out/PlexPy.py
+
+    # Remove superfluous Python checks from main script;
+    # prepend shebang
+    echo "#!${python.interpreter}" > $out/Tautulli.py
+    tail -n +7 Tautulli.py >> $out/Tautulli.py
+
+
+    mkdir $out/bin
+    # Can't just symlink to the main script, since it uses __file__ to
+    # import bundled packages and manage the service
+    echo "#!/bin/bash" > $out/bin/tautulli
+    echo "$out/Tautulli.py \$*" >> $out/bin/tautulli
+    chmod +x $out/bin/tautulli
+
+    # Creat backwards compatibility symlink to bin/plexpy
+    ln -s $out/bin/tautulli $out/bin/plexpy
+
+    wrapPythonProgramsIn "$out" "$out $pythonPath"
+  '';
+
+  meta  = with stdenv.lib; {
+    description = "A Python based monitoring and tracking tool for Plex Media Server.";
+    homepage = https://tautulli.com/;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ csingley ];
+  };
+}
diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix
index 6342be5fe49..1d523351d1e 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "traefik-${version}";
-  version = "1.7.8";
+  version = "1.7.9";
 
   goPackagePath = "github.com/containous/traefik";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "containous";
     repo = "traefik";
     rev = "v${version}";
-    sha256 = "19x2shx5a6ccnc1r0jl51b9qrypzl38npdcy07352lm6jdffi8i4";
+    sha256 = "0lncygkqws5jvbhpx2qlr18y8b325y9a6690ll9azlphxydrv44m";
   };
 
   buildInputs = [ go-bindata bash ];
diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix
new file mode 100644
index 00000000000..bae43412e78
--- /dev/null
+++ b/pkgs/servers/ttyd/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub
+, pkgconfig, cmake, xxd
+, openssl, libwebsockets, json_c, libuv
+}:
+
+with builtins;
+
+let
+  # ttyd hasn't seen a release in quite a while. remove all this
+  # junk when a new one happens (eventually)
+  revCount = 174;
+  src = fetchFromGitHub {
+    owner  = "tsl0922";
+    repo   = "ttyd";
+    rev    = "6df6ac3e03b705ddd46109c2ac43a1cba439c0df";
+    sha256 = "0g5jlfa7k6qd59ysdagczlhwgjfjspb3sfbd8b790hcil933qrxm";
+  };
+
+in stdenv.mkDerivation rec {
+  name = "ttyd-${version}";
+  version = "1.4.2_pre${toString revCount}_${substring 0 8 src.rev}";
+  inherit src;
+
+  nativeBuildInputs = [ pkgconfig cmake xxd ];
+  buildInputs = [ openssl libwebsockets json_c libuv ];
+  enableParallelBuilding = true;
+
+  outputs = [ "out" "man" ];
+
+  meta = {
+    description = "Share your terminal over the web";
+    homepage    = https://github.com/tsl0922/ttyd;
+    license     = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    platforms   = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index efdf5914e18..1e9ce4a232b 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -49,8 +49,8 @@ in rec {
   };
 
   unifiStable = generic {
-    version = "5.10.17";
-    sha256  = "0mkbyz14c0i435afj4wyhnp45hbhvmhvcg02yxd2xs3zmcr8sjgz";
+    version = "5.10.19";
+    sha256  = "01ylf11z4f86qrw9x0fn1mnxkb8iw0p2kslp7vgxgjp0i3mg3f2q";
   };
 
   unifiTesting = unifiStable;
diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index 99eac2760dd..1deba4e12af 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -49,11 +49,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "uwsgi-${version}";
-  version = "2.0.17.1";
+  version = "2.0.18";
 
   src = fetchurl {
     url = "https://projects.unbit.it/downloads/${name}.tar.gz";
-    sha256 = "0xxjb9dyivq5531birvxq2gnyxf2x5q7gz54440acra6qwsq4cfj";
+    sha256 = "10zmk4npknigmbqcq1wmhd461dk93159px172112vyq0i19sqwj9";
   };
 
   nativeBuildInputs = [ python3 pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index d62d61b429e..886de897db8 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -42,6 +42,10 @@ self: super:
     buildInputs = attrs.buildInputs ++ [ self.mkfontscale ];
   });
 
+  editres = super.editres.overrideAttrs (attrs: {
+    hardeningDisable = [ "format" ];
+  });
+
   fontbhttf = super.fontbhttf.overrideAttrs (attrs: {
     meta = attrs.meta // { license = lib.licenses.unfreeRedistributable; };
   });
@@ -285,6 +289,10 @@ self: super:
     meta = attrs.meta // { platforms = stdenv.lib.platforms.linux; };
   });
 
+  oclock = super.oclock.overrideAttrs (attrs: {
+    buildInputs = attrs.buildInputs ++ [ self.libxkbfile ];
+  });
+
   setxkbmap = super.setxkbmap.overrideAttrs (attrs: {
     postInstall =
       ''