Merge branch 'cmake32'

Packages that use CMake and depend on OpenSSL should use CMake 3.2 or later.

pkgs/development/libraries/jsoncpp/1.6.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, python }:
+
+let
+  basename = "jsoncpp";
+  version = "1.6.0";
+in
+stdenv.mkDerivation rec {
+  name = "${basename}-${version}";
+  src = fetchurl {
+    url = "https://github.com/open-source-parsers/${basename}/archive/${version}.tar.gz";
+    sha256 = "0ff1niks3y41gr6z13q9m391na70abqyi9rj4z3y2fz69cwm6sgz";
+  };
+
+  nativeBuildInputs = [ cmake python ];
+
+  meta = {
+    inherit version;
+    homepage = https://github.com/open-source-parsers/jsoncpp;
+    description = "A simple API to manipulate JSON data in C++";
+    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+    license = with stdenv.lib.licenses; [ mit ];
+    branch = "1.6";
+  };
+}

pkgs/development/libraries/kde-frameworks-5.7/default.nix

@@ -72,8 +72,9 @@ let
     # packages from the nixpkgs collection
     (with pkgs;
       {
-        inherit cmake epoxy;
         Boost = boost155;
+        cmake = cmake-3_2;
+        inherit epoxy;
         GIF = giflib;
         GLIB2 = glib;
         Gpgme = gpgme;
@@ -105,7 +106,7 @@ let
       extra-cmake-modules = {
         inherit (super.extra-cmake-modules) name src;
 
-        propagatedNativeBuildInputs = [ pkgs.cmake pkgs.pkgconfig qt5.tools ];
+        propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ];
         cmakeFlags = ["-DBUILD_TESTING=OFF"];
         patches =
           [

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

@@ -0,0 +1,67 @@
+{ stdenv, fetchurl
+, bzip2, curl, expat, jsoncpp, libarchive, xz, zlib
+, useNcurses ? false, ncurses, useQt4 ? false, qt4
+}:
+
+with stdenv.lib;
+
+let
+  os = stdenv.lib.optionalString;
+  majorVersion = "3.2";
+  minorVersion = "1";
+  version = "${majorVersion}.${minorVersion}";
+in
+
+stdenv.mkDerivation rec {
+  name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}";
+
+  inherit majorVersion;
+
+  src = fetchurl {
+    url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
+    sha256 = "0b2hy4p0aa9zshlxyw9nmlh5q8q1lmnwmb594rvh6sx2n7v1r7vm";
+  };
+
+  enableParallelBuilding = true;
+
+  patches =
+    # Don't search in non-Nix locations such as /usr, but do search in
+    # Nixpkgs' Glibc.
+    optional (stdenv ? glibc) ./search-path-3.0.patch ++
+    optional (stdenv ? cross) (fetchurl {
+      name = "fix-darwin-cross-compile.patch";
+      url = "http://public.kitware.com/Bug/file_download.php?"
+          + "file_id=4981&type=bug";
+      sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
+    });
+
+  buildInputs =
+    [ bzip2 curl expat jsoncpp libarchive xz zlib ]
+    ++ optional useNcurses ncurses
+    ++ optional useQt4 qt4;
+
+  CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
+
+  configureFlags =
+    "--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
+    + stdenv.lib.optionalString useQt4 " --qt-gui";
+
+  setupHook = ./setup-hook.sh;
+
+  dontUseCmakeConfigure = true;
+
+  preConfigure = optionalString (stdenv ? glibc)
+    ''
+      source $setupHook
+      fixCmakeFiles .
+      substituteInPlace Modules/Platform/UnixPaths.cmake \
+        --subst-var-by glibc ${stdenv.glibc}
+    '';
+
+  meta = {
+    homepage = http://www.cmake.org/;
+    description = "Cross-Platform Makefile Generator";
+    platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ urkud mornfall ttuegel ];
+  };
+}

pkgs/top-level/all-packages.nix

@@ -4913,6 +4913,9 @@ let
     ps     = if stdenv.isDarwin then darwin.ps else null;
   };
 
+  cmake-3_2 = callPackage ../development/tools/build-managers/cmake/3.2.nix {
+    jsoncpp = jsoncpp-1_6;
+  };
   cmake-3_0 = callPackage ../development/tools/build-managers/cmake/3.0.nix { };
   cmake264 = callPackage ../development/tools/build-managers/cmake/264.nix { };
 
@@ -6074,6 +6077,7 @@ let
   json_c = callPackage ../development/libraries/json-c { };
 
   jsoncpp = callPackage ../development/libraries/jsoncpp { };
+  jsoncpp-1_6 = callPackage ../development/libraries/jsoncpp/1.6.nix { };
 
   libjson = callPackage ../development/libraries/libjson { };