Merge branch 'master' into staging

pkgs/development/tools/build-managers/cmake/cmake_find_openssl_for_openssl-1.0.1m_and_up.patch

@@ -0,0 +1,11 @@
+--- ./Modules/FindOpenSSL.cmake
++++ ./Modules/FindOpenSSL.cmake
+@@ -264,7 +264,7 @@
+     set(OPENSSL_VERSION "${_OPENSSL_VERSION}")
+   elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
+     file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
+-         REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
++         REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
+
+     # The version number is encoded as 0xMNNFFPPS: major minor fix patch status
+     # The status gives if this is a developer or prerelease and is ignored here.

pkgs/development/tools/build-managers/cmake/default.nix

@@ -33,7 +33,11 @@ stdenv.mkDerivation rec {
       url = "http://public.kitware.com/Bug/file_download.php?"
           + "file_id=4981&type=bug";
       sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
-    });
+    }) ++
+    # fix cmake detection of openssl libs
+    # see: http://public.kitware.com/Bug/bug_relationship_graph.php?bug_id=15386
+    #      and http://www.cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505#patch1
+    [./cmake_find_openssl_for_openssl-1.0.1m_and_up.patch];
 
   buildInputs =
     [ bzip2 curl expat libarchive xz zlib ]