pyrox.dev
cmake: 3.31.6 -> 3.31.7 (#402343)
authored by
-13
pkgs/by-name/cm/cmake/009-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NETRC-values.diff
-13
pkgs/by-name/cm/cmake/009-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NETRC-values.diff
···
1
-
diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx
2
-
index b9133ed7d47b9023de66a94ed5ff15a0f1ba440c..0cf8a71a72daaa07cb42b3f5eef81d2d04300cd6 100644
3
-
--- a/Source/cmCurl.cxx
4
-
+++ b/Source/cmCurl.cxx
5
-
@@ -170,7 +170,7 @@ std::string cmCurlSetNETRCOption(::CURL* curl, const std::string& netrc_level,
6
-
const std::string& netrc_file)
7
-
{
8
-
std::string e;
9
-
- CURL_NETRC_OPTION curl_netrc_level = CURL_NETRC_LAST;
10
-
+ long curl_netrc_level = CURL_NETRC_LAST;
11
-
::CURLcode res;
12
-
13
-
if (!netrc_level.empty()) {
+2
-4
pkgs/by-name/cm/cmake/package.nix
+2
-4
pkgs/by-name/cm/cmake/package.nix
···
48
48
+ lib.optionalString isMinimalBuild "-minimal"
49
49
+ lib.optionalString cursesUI "-cursesUI"
50
50
+ lib.optionalString qt5UI "-qt5UI";
51
-
version = "3.31.6";
51
+
version = "3.31.7";
52
52
53
53
src = fetchurl {
54
54
url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz";
55
-
hash = "sha256-ZTQn8PUBR1Cq//InJ/sqpgxscyypGAjPt4ziLd2eVfA=";
55
+
hash = "sha256-ptLrHr65kTDf5j71o0DD/bEUMczj18oUhSTBJZJM6mg=";
56
56
};
57
57
58
58
patches =
···
76
76
# Backport of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9900
77
77
# Needed to correctly link curl in pkgsStatic.
78
78
./008-FindCURL-Add-more-target-properties-from-pkg-config.diff
79
-
# Backport of https://gitlab.kitware.com/cmake/cmake/-/commit/1b0c92a3a1b782ff3e1c4499b6ab8db614d45bcd
80
-
./009-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NETRC-values.diff
81
79
];
82
80
83
81
outputs =