From 76c4b5fcca06441e00e1d27d44f3a601915f8d66 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Tue, 20 Dec 2016 16:20:08 +0100 Subject: [PATCH] cmake: 3.6.2 -> 3.7.1 --- .../tools/build-managers/cmake/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 1e4bacb07254..fbc6f5be5ca8 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 +, bzip2, curl, expat, libarchive, xz, zlib, libuv , useNcurses ? false, ncurses, useQt4 ? false, qt4 , wantPS ? false, ps ? null }: @@ -12,8 +12,8 @@ assert stdenv.cc ? libc; let os = stdenv.lib.optionalString; - majorVersion = "3.6"; - minorVersion = "2"; + majorVersion = "3.7"; + minorVersion = "1"; version = "${majorVersion}.${minorVersion}"; in @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - sha256 = "0imkz04ncz6cv5659qfd4scm99k3siq7zrrsa8pvp663d8mf76hq"; + # from https://cmake.org/files/v3.7/cmake-3.7.1-SHA-256.txt + sha256 = "449a5bce64dbd4d5b9517ebd1a1248ed197add6ad27934478976fd5f1f9330e1"; }; # Don't search in non-Nix locations such as /usr, but do search in our libc. @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; buildInputs = - [ setupHook pkgconfig bzip2 curl expat libarchive xz zlib ] + [ setupHook pkgconfig bzip2 curl expat libarchive xz zlib libuv ] ++ optional useNcurses ncurses ++ optional useQt4 qt4;