Merge branch 'cmake-3.6' into staging

This commit is contained in:
Thomas Tuegel 2016-08-02 15:48:27 -05:00
commit e058ac5487

View File

@ -10,8 +10,8 @@ assert wantPS -> (ps != null);
let
os = stdenv.lib.optionalString;
majorVersion = "3.4";
minorVersion = "3";
majorVersion = "3.6";
minorVersion = "0";
version = "${majorVersion}.${minorVersion}";
in
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
sha256 = "1yl0z422gr7zfc638chifv343vx0ig5gasvrh7nzf7b15488qgxp";
sha256 = "0w3n2i02jpbgai4dxsigm1c1i1qb5v70wyxckzwrxvs0ri0fs1gx";
};
patches =