From d74d871f52512a1f827d2dc165db685f499ce5f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 11 Jun 2017 15:27:33 +0200 Subject: [PATCH] cmake: 3.7.2 -> 3.8.2 Tested several cmake-built packages, and all seems OK; hopefully there won't be many problems. --- .../development/tools/build-managers/cmake/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index d0a346038352..13c404374b0c 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, bzip2, curl, expat, libarchive, xz, zlib, libuv +, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash # darwin attributes , ps , isBootstrap ? false @@ -12,7 +12,7 @@ with stdenv.lib; let os = stdenv.lib.optionalString; - majorVersion = "3.7"; + majorVersion = "3.8"; minorVersion = "2"; version = "${majorVersion}.${minorVersion}"; in @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - # from https://cmake.org/files/v3.7/cmake-3.7.2-SHA-256.txt - sha256 = "dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0"; + # from https://cmake.org/files/v3.8/cmake-3.8.2-SHA-256.txt + sha256 = "da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d"; }; prePatch = optionalString (!useSharedLibraries) '' @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ setupHook pkgconfig ] - ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv ] + ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] ++ optional useNcurses ncurses ++ optional useQt4 qt4;