Merge branch 'staging'

Hydra seems very good.

3 files changed, 20 insertions, 11 deletions

diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix
index 8dc6db03bc31..3adf4f1497f8 100644
--- a/pkgs/development/libraries/wt/default.nix
+++ b/pkgs/development/libraries/wt/default.nix
@@ -1,14 +1,15 @@
-{stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu, 
-  pango, fcgi, firebird, libmysql, postgresql, graphicsmagick, glew, openssl,
-  pcre }:
+{ stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu
+, pango, fcgi, firebird, libmysql, postgresql, graphicsmagick, glew, openssl
+, pcre
+}:
 
 stdenv.mkDerivation rec {
-  name = "wt";
+  name = "wt-${version}";
   version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "kdeforche";
-    repo = name;
+    repo = "wt";
     rev = version;
     sha256 = "1451xxvnx6mlvxg0jxlr1mfv5v18h2214kijk5kacilqashfc43i";
   };
@@ -16,9 +17,11 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake boost doxygen qt48Full libharu 
-    pango fcgi firebird libmysql postgresql graphicsmagick glew 
-    openssl pcre ];
+  buildInputs = [
+    cmake boost doxygen qt48Full libharu
+    pango fcgi firebird libmysql postgresql graphicsmagick glew
+    openssl pcre
+  ];
 
   cmakeFlags = [
     "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
@@ -31,7 +34,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://www.webtoolkit.eu/wt;
     description = "C++ library for developing web applications";
-    platforms = platforms.linux ;
+    platforms = platforms.linux;
     license = licenses.gpl2;
     maintainers = [ maintainers.juliendehos ];
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9825a527820a..c38ee66735e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11425,7 +11425,9 @@ with pkgs;
 
   charybdis = callPackage ../servers/irc/charybdis {};
 
-  clickhouse = callPackage ../servers/clickhouse { };
+  clickhouse = callPackage ../servers/clickhouse {
+    boost = boost160;
+  };
 
   couchdb = callPackage ../servers/http/couchdb {
     spidermonkey = spidermonkey_1_8_5;
@@ -17451,6 +17453,7 @@ with pkgs;
   zanshin = libsForQt5.callPackage ../applications/office/zanshin {
     inherit (kdeApplications) akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap;
     inherit (kdeFrameworks) krunner kwallet;
+    boost = boost160;
   };
 
   zathura = callPackage ../applications/misc/zathura {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index daee60ccec43..b27147e18b50 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -95,7 +95,10 @@ in {
 
   setuptools = callPackage ../development/python-modules/setuptools { };
 
-  vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { pythonPackages = self; };
+  vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit {
+    pythonPackages = self;
+    boost = pkgs.boost160;
+  };
 
   acoustics = callPackage ../development/python-modules/acoustics { };