alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

cmake: 3.19.7 -> 3.21.0

Browse source 
Also removing a comment that instructs maintainers to cross-check
the hash with one that is posted upstream, because as @lilyball
reasoned:

"I'm not really sure what the benefit of comparing the hash is; if the
download is tampered with, the hash is served from the same site and
would presumably be tampered with as well, and the download is done over
https and declares its Content-Length so there's no risk of truncation
(which would cause the file to fail to unpack anyway)"
This commit is contained in:
Tobias Mayer 2021-07-20 18:25:09 +02:00 committed by Frederik Rietdijk
parent ea0b0b7d12
commit 29bbaa1489
2 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/development/tools/build-managers/cmake/application-services.patch
View file

@ -1,8 +1,8 @@
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 1b6bb00d4c..487114daa8 100644
index 9a18184fd3..278d146dd1 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -893,7 +893,6 @@ endif()
@@ -933,7 +933,6 @@ endif()
# On Apple we need CoreFoundation and CoreServices
if(APPLE)
target_link_libraries(CMakeLib "-framework CoreFoundation")
@ -11,27 +11,25 @@ index 1b6bb00d4c..487114daa8 100644
if(WIN32 AND NOT UNIX)
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index a5ce5d18f4..3d6838ce82 100644
index 77403b076a..d5aac95e1e 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -43,11 +43,10 @@
struct cmLinkImplementation;
@@ -49,10 +49,6 @@ struct cmLinkImplementation;
#if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__)
-# define HAVE_APPLICATION_SERVICES
-# include <ApplicationServices/ApplicationServices.h>
+# include <CoreFoundation/CoreFoundation.h>
# include <CoreFoundation/CoreFoundation.h>
-# if !TARGET_OS_IPHONE
-# define HAVE_APPLICATION_SERVICES
-# include <ApplicationServices/ApplicationServices.h>
-# endif
#endif
#if !defined(CMAKE_BOOTSTRAP)
# include "cmXMLParser.h"
#if !defined(CMAKE_BOOTSTRAP)
diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index bfcaf30bb7..1da540aee5 100644
index 79452ffff6..a848731b7e 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -2007,11 +2007,6 @@ IF(ENABLE_TEST)
@@ -2013,11 +2013,6 @@ IF(ENABLE_TEST)
ENDIF(ENABLE_TEST)
ENDIF()

5
pkgs/development/tools/build-managers/cmake/default.nix
View file

@ -16,12 +16,11 @@ stdenv.mkDerivation rec {
+ lib.optionalString isBootstrap "-boot"
+ lib.optionalString useNcurses "-cursesUI"
+ lib.optionalString withQt5 "-qt5UI";
version = "3.19.7";
version = "3.21.0";
src = fetchurl {
url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
# compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
sha256 = "sha256-WKFfDVagr8zDzFNxI0/Oc/zGyPnb13XYmOUQuDF1WI4=";
sha256 = "sha256-SkLVZEmlH004CatNO2H9SpakaeViZuiWzhAJtXaL0qs=";
};
patches = [