cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

cmake: 3.28.1 -> 3.28.2

Browse source
This commit is contained in:
Jacek Galowicz 2024-01-31 21:35:46 +01:00
parent b272934b4b
commit 1bee8a0b0a
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
diff -Naur cmake-3.28.1/Utilities/cmcurl/CMakeLists.txt cmake-3.28.1-new/Utilities/cmcurl/CMakeLists.txt
--- cmake-3.28.1/Utilities/cmcurl/CMakeLists.txt 2023-12-14 10:47:27.000000000 -0500
+++ cmake-3.28.1-new/Utilities/cmcurl/CMakeLists.txt 2024-01-08 14:45:45.000000000 -0500
diff -ru cmake-3.28.2/Utilities/cmcurl/CMakeLists.txt cmake-3.28.2-patched/Utilities/cmcurl/CMakeLists.txt
--- cmake-3.28.2/Utilities/cmcurl/CMakeLists.txt 2024-01-29 21:01:32
+++ cmake-3.28.2-patched/Utilities/cmcurl/CMakeLists.txt 2024-01-31 21:20:02
@@ -470,13 +470,6 @@
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT ENABLE_ARES)
@ -15,15 +15,15 @@ diff -Naur cmake-3.28.1/Utilities/cmcurl/CMakeLists.txt cmake-3.28.1-new/Utiliti
endif()
endif()
diff -Naur cmake-3.28.1/Utilities/cmcurl/lib/curl_setup.h cmake-3.28.1-new/Utilities/cmcurl/lib/curl_setup.h
--- cmake-3.28.1/Utilities/cmcurl/lib/curl_setup.h 2023-12-14 10:47:27.000000000 -0500
+++ cmake-3.28.1-new/Utilities/cmcurl/lib/curl_setup.h 2024-01-08 14:45:08.000000000 -0500
@@ -255,12 +255,6 @@
diff -ru cmake-3.28.2/Utilities/cmcurl/lib/curl_setup.h cmake-3.28.2-patched/Utilities/cmcurl/lib/curl_setup.h
--- cmake-3.28.2/Utilities/cmcurl/lib/curl_setup.h 2024-01-29 21:01:32
+++ cmake-3.28.2-patched/Utilities/cmcurl/lib/curl_setup.h 2024-01-31 21:20:50
@@ -255,12 +255,7 @@
* 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
- #define USE_RESOLVE_ON_IPS 1
-# if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && \
- defined(ENABLE_IPV6)
-# define CURL_MACOS_CALL_COPYPROXIES 1

8
pkgs/by-name/cm/cmake/package.nix
View file

@ -32,7 +32,7 @@
}:
let
inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreServices;
inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration;
inherit (libsForQt5) qtbase wrapQtAppsHook;
cursesUI = lib.elem "ncurses" uiToolkits;
qt5UI = lib.elem "qt5" uiToolkits;
@ -46,11 +46,11 @@ stdenv.mkDerivation (finalAttrs: {
+ lib.optionalString isMinimalBuild "-minimal"
+ lib.optionalString cursesUI "-cursesUI"
+ lib.optionalString qt5UI "-qt5UI";
version = "3.28.1";
version = "3.28.2";
src = fetchurl {
url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz";
hash = "sha256-FelPg+ZH99YgoUCnpdp2NJ/Eehv+1m0PXN7o5zRAea0=";
hash = "sha256-FGb4ctwcIm83PPj7pCMO0hao8Qi9VLR3tczf2eotEko=";
};
patches = [
@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional useOpenSSL openssl
++ lib.optional cursesUI ncurses
++ lib.optional qt5UI qtbase
++ lib.optional (stdenv.isDarwin) CoreServices
++ lib.optional stdenv.isDarwin CoreServices
++ lib.optional (stdenv.isDarwin && !isMinimalBuild) SystemConfiguration;
propagatedBuildInputs = lib.optional stdenv.isDarwin ps;