2 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 71358c806d8c..17f754f6acca 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, ncurses, openssl, aspell, gnutls
 , zlib, curl , pkgconfig, libgcrypt
 , cmake, makeWrapper, libobjc, libiconv
+, asciidoctor # manpages
 , guileSupport ? true, guile
 , luaSupport ? true, lua5
 , perlSupport ? true, perl
@@ -28,7 +29,13 @@ stdenv.mkDerivation rec {
     sha256 = "0d1wcpsxx13clcf1ygcn5hsa1pjkck4xznbjbxphbdxd5whsbv3k";
   };
 
-  cmakeFlags = with stdenv.lib; []
+  outputs = [ "out" "doc" ];
+
+  enableParallelBuilding = true;
+  cmakeFlags = with stdenv.lib; [
+    "-DENABLE_MAN=ON"
+    "-DENABLE_DOC=ON"
+  ]
     ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"]
     ++ optional (!guileSupport) "-DENABLE_GUILE=OFF"
     ++ optional (!luaSupport)   "-DENABLE_LUA=OFF"
@@ -41,7 +48,8 @@ stdenv.mkDerivation rec {
       ncurses python openssl aspell gnutls zlib curl pkgconfig
       libgcrypt pycrypto makeWrapper
       cmake
-    ]
+      asciidoctor
+      ]
     ++ optionals stdenv.isDarwin [ pync libobjc ]
     ++ optional  guileSupport    guile
     ++ optional  luaSupport      lua5
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 801b93a02de1..90d57601e803 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -11,13 +11,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "1.12.1";
+  version = "1.12.2";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker";
     rev = "v${version}";
-    sha256 = "079786dyydjfc8vb6djxh140pc7v16fjl5x2h2q420qc3mrfz5zd";
+    sha256 = "01smz3j55p12z5gkpl945sw49g7aqkxacrlzrlm5px9158z1j74p";
   };
 
   buildInputs = [