Unverified Commit 9448060f authored by Masum Reza's avatar Masum Reza Committed by GitHub
Browse files

cmake: 3.29.6 -> 3.30.4 (#328256)

parents 8a59865b b3238d53

pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff

+12 −10
Original line number Diff line number Diff line 
diff -Naur cmake-3.28.2/Utilities/cmcurl/CMakeLists.txt cmake-3.28.2-new/Utilities/cmcurl/CMakeLists.txt

--- cmake-3.28.2/Utilities/cmcurl/CMakeLists.txt	2024-01-29 23:01:32.000000000 +0300

+++ cmake-3.28.2-new/Utilities/cmcurl/CMakeLists.txt	2024-02-16 13:09:40.805479195 +0300

@@ -470,13 +470,6 @@

diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt

index b766aee425..ad50e64ce6 100644

--- a/Utilities/cmcurl/CMakeLists.txt

+++ b/Utilities/cmcurl/CMakeLists.txt

@@ -466,13 +466,6 @@ if(ENABLE_IPV6 AND NOT WIN32)

 

   if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT ENABLE_ARES)

     set(use_core_foundation_and_core_services ON)
@@ -14,18 +15,19 @@ diff -Naur cmake-3.28.2/Utilities/cmcurl/CMakeLists.txt cmake-3.28.2-new/Utiliti 
-    list(APPEND CURL_LIBS "-framework SystemConfiguration")

   endif()

 endif()

 

diff -Naur cmake-3.28.2/Utilities/cmcurl/lib/curl_setup.h cmake-3.28.2-new/Utilities/cmcurl/lib/curl_setup.h

--- cmake-3.28.2/Utilities/cmcurl/lib/curl_setup.h	2024-01-29 23:01:32.000000000 +0300

+++ cmake-3.28.2-new/Utilities/cmcurl/lib/curl_setup.h	2024-02-16 13:10:38.822445566 +0300

@@ -255,12 +255,6 @@

 if(ENABLE_IPV6)

diff --git a/Utilities/cmcurl/lib/curl_setup.h b/Utilities/cmcurl/lib/curl_setup.h

index f7ba7e92a5..e4663cbf36 100644

--- a/Utilities/cmcurl/lib/curl_setup.h

+++ b/Utilities/cmcurl/lib/curl_setup.h

@@ -316,12 +316,6 @@

  * performing this task will result in a synthesized IPv6 address.

  */

 #if defined(__APPLE__) && !defined(USE_ARES)

-#include <TargetConditionals.h>

-#define USE_RESOLVE_ON_IPS 1

-#  if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && \

-     defined(ENABLE_IPV6)

-     defined(USE_IPV6)

-#    define CURL_MACOS_CALL_COPYPROXIES 1

-#  endif

 #endif

pkgs/by-name/cm/cmake/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { 
    + lib.optionalString isMinimalBuild "-minimal"

    + lib.optionalString cursesUI "-cursesUI"

    + lib.optionalString qt5UI "-qt5UI";

  version = "3.29.6";

  version = "3.30.4";



  src = fetchurl {

    url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz";

    hash = "sha256-E5ExMAO4PUjiqxFai1JaVX942MFURhi0jR2QGEoQ8K8=";

    hash = "sha256-x1nJcnTx56qq/LHw0mH53pvzpdbst+LfYWMkpG/nBLI=";

  };



  patches = [