lol

cmake: bring back 3.9 for Darwin bootstrap

Broken by ba6e0ae33df36; see e.g. https://hydra.nixos.org/build/68223628

+21 -4
+17 -3
pkgs/development/tools/build-managers/cmake/default.nix
··· 1 1 { stdenv, fetchurl, pkgconfig 2 2 , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash 3 + , majorVersion ? "3.10" 3 4 # darwin attributes 4 5 , ps 5 6 , isBootstrap ? false ··· 14 15 15 16 with stdenv.lib; 16 17 18 + with ( 19 + { 20 + "3.10" = { 21 + minorVersion = "2"; 22 + sha256 = "80d0faad4ab56de07aa21a7fc692c88c4ce6156d42b0579c6962004a70a3218b"; 23 + }; 24 + "3.9" = { 25 + minorVersion = "6"; 26 + sha256 = "7410851a783a41b521214ad987bb534a7e4a65e059651a2514e6ebfc8f46b218"; 27 + }; 28 + 29 + }.${majorVersion} 30 + or (abort ''Unsupported configuration for cmake: majorVersion = "${majorVersion}";'') 31 + ); 32 + 17 33 let 18 34 os = stdenv.lib.optionalString; 19 - majorVersion = "3.10"; 20 - minorVersion = "2"; 21 35 version = "${majorVersion}.${minorVersion}"; 22 36 in 23 37 ··· 29 43 src = fetchurl { 30 44 url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; 31 45 # from https://cmake.org/files/v3.10/cmake-3.10.2-SHA-256.txt 32 - sha256 = "80d0faad4ab56de07aa21a7fc692c88c4ce6156d42b0579c6962004a70a3218b"; 46 + inherit sha256; 33 47 }; 34 48 35 49 prePatch = optionalString (!useSharedLibraries) ''
+4 -1
pkgs/top-level/all-packages.nix
··· 6348 6348 llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({ 6349 6349 inherit (stdenvAdapters) overrideCC; 6350 6350 } // stdenv.lib.optionalAttrs stdenv.isDarwin { 6351 - cmake = cmake.override { isBootstrap = true; }; 6351 + cmake = cmake.override { 6352 + isBootstrap = true; 6353 + majorVersion = "3.9"; # 3.10.2: 'ApplicationServices/ApplicationServices.h' file not found 6354 + }; 6352 6355 libxml2 = libxml2.override { pythonSupport = false; }; 6353 6356 python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; }; 6354 6357 });