Merge remote-tracking branch 'upstream/master' into HEAD

5 files changed, 31 insertions, 16 deletions

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 06594885dbc2..6a29ecaad569 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -32,20 +32,20 @@ let
 in {
   tomcat7 = common {
     versionMajor = "7";
-    versionMinor = "0.75";
-    sha256 = "0w5adsy4792qkf3ws46f539lrdbpz7lghy79s6b04c9yqaxjz6ni";
+    versionMinor = "0.81";
+    sha256 = "0mcr3caizqk6qrc0j9p91apdsg65ksawg0l6xpqk1fq6071nd5rq";
   };
 
   tomcat8 = common {
     versionMajor = "8";
-    versionMinor = "0.41";
-    sha256 = "1mvnf6m29y3p40vvi9mgghrddlmgwcrcvfwrf9vbama78fsh8wm5";
+    versionMinor = "0.46";
+    sha256 = "14wb9mgb7z02j6wvvmcsfc2zkcqnijc40gzyg1mnxcy5fvf8nzpk";
   };
 
   tomcat85 = common {
     versionMajor = "8";
-    versionMinor = "5.14";
-    sha256 = "0dls16lw7yak3s6cwwcccfg0qb5g8s36waxlg8wgjk8vc57h316w";
+    versionMinor = "5.20";
+    sha256 = "1l5cgxzaassjnfbr4rbr3wzz45idcqa8aqhphhvlx1xl8xqv6p8a";
   };
 
   tomcatUnstable = common {
diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix
index ebbd10e8fa2c..93c854d8e08b 100644
--- a/pkgs/servers/openafs-client/default.nix
+++ b/pkgs/servers/openafs-client/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "openafs-${version}-${kernel.version}";
-  version = "1.6.20.2";
+  version = "1.6.21";
 
   src = fetchurl {
     url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
-    sha256 = "50234820c3da9752d2ca05fb7e83b7dc5c96a0e96a0b875ebc7ae3c835607614";
+    sha256 = "ba9c1f615edd53b64fc271ad369c49a816acedca70cdd090975033469a84118f";
   };
 
   nativeBuildInputs = [ autoconf automake flex yacc perl which ];
@@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = [ maintainers.z77z ];
     broken =
-      (builtins.compareVersions kernel.version  "3.18" == -1);
+      (builtins.compareVersions kernel.version  "3.18" == -1) ||
+      (builtins.compareVersions kernel.version "4.13" == 0);
   };
 }
diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 0e5cb3e697f5..9b2278fe3667 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -6,9 +6,9 @@
 let
   plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass";
   plexpkg = if enablePlexPass then plexPass else {
-    version = "1.7.5.4035";
-    vsnHash = "313f93718";
-    sha256 = "89b8585e561046a8422d520ebcdae784f5dc3c895aac8d313c435cc6b58795b8";
+    version = "1.8.4.4249";
+    vsnHash = "3497d6779";
+    sha256 = "ca3db297f4dbc73a5a405ac032ff250e5df97b84da6dcac55165b13e6445ca80";
   };
 
 in stdenv.mkDerivation rec {
diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix
index 088eef0830b9..3b86cf1758c0 100644
--- a/pkgs/servers/radarr/default.nix
+++ b/pkgs/servers/radarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "radarr-${version}";
-  version = "0.2.0.778";
+  version = "0.2.0.846";
 
   src = fetchurl {
     url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz";
-    sha256 = "0145nsdnhsd3nbg2nml5malm4kn28k2siaimqb41dcmc88fws015";
+    sha256 = "1lpr05aaf6a9p2msmsh0j8krxk83sf5d3avrh5qpyjap5j3phvky";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix
index 71e51d4c765c..bdc37b700e5d 100644
--- a/pkgs/servers/trezord/default.nix
+++ b/pkgs/servers/trezord/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, curl, cmake, boost, gcc, protobuf, pkgconfig, jsoncpp
+{ stdenv, fetchgit, fetchFromGitHub, curl, cmake, boost, gcc, protobuf, pkgconfig, jsoncpp
 , libusb1, libmicrohttpd
 }:
 
@@ -15,6 +15,13 @@ stdenv.mkDerivation rec {
     sha256 = "1iaxmwyidjdcrc6jg0859v6v5x3qnz5b0p78pq0bypvmgyijhpm4";
   };
 
+  common = fetchFromGitHub {
+    owner = "trezor";
+    repo = "trezor-common";
+    rev = "b55fb61218431e9c99c9d6c1673801902fc9e92e";
+    sha256 = "1zanbgz1qjs8wfwp0z91sqcvj77a9iis694k415jyd2dn4riqhdg";
+  };
+
   meta = with stdenv.lib; {
     description = "TREZOR Bridge daemon for TREZOR bitcoin hardware wallet";
     homepage = https://mytrezor.com;
@@ -40,8 +47,15 @@ stdenv.mkDerivation rec {
     jsoncpp
   ];
 
+  preConfigure = ''
+    ( cd src/config
+      ln -s $common/protob/config.proto
+      protoc -I . --cpp_out=. config.proto
+    )
+  '';
+
   LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ curl ]}";
-  cmakeFlags="-DJSONCPP_LIBRARY='${jsoncpp}/lib/libjsoncpp.so'";
+  cmakeFlags = [ "-DJSONCPP_LIBRARY='${jsoncpp}/lib/libjsoncpp.so'" ];
 
   installPhase = ''
     mkdir -p $out/bin