dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge #299580: curl: 8.6.0 -> 8.7.1

Browse Source 
...into staging
This commit is contained in:
Vladimír Čunát 2024-04-10 08:06:59 +02:00
commit d68f826302
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/rustls-ffi/default.nix
View File

@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec {
passthru.tests = {
apacheHttpd = apacheHttpd.override { modTlsSupport = true; };
curl = curl.override { opensslSupport = false; rustlsSupport = true; };
# Currently broken notably because of https://github.com/curl/curl/issues/13248
# curl = curl.override { opensslSupport = false; rustlsSupport = true; };
};
meta = with lib; {

7
pkgs/tools/networking/curl/default.nix
View File

@ -49,14 +49,14 @@ assert !((lib.count (x: x) [ gnutlsSupport opensslSupport wolfsslSupport rustlsS
stdenv.mkDerivation (finalAttrs: {
pname = "curl";
version = "8.6.0";
version = "8.7.1";
src = fetchurl {
urls = [
"https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.xz"
"https://github.com/curl/curl/releases/download/curl-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}/curl-${finalAttrs.version}.tar.xz"
];
hash = "sha256-PM1V2Rr5UWU534BiX4GMc03G8uz5utozx2dl6ZEh2xU=";
hash = "sha256-b+oqrGpGEPvQQAr7C83b5yWKZMY/H2jlhV68DGWXEM0=";
};
postPatch = ''
@ -196,6 +196,7 @@ stdenv.mkDerivation (finalAttrs: {
# nginx-http3 = useThisCurl nixosTests.nginx-http3;
nginx-http3 = nixosTests.nginx-http3;
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
} // lib.optionalAttrs (stdenv.hostPlatform.system != "x86_64-darwin") {
static = pkgsStatic.curl;
} // lib.optionalAttrs (!stdenv.isDarwin) {
fetchpatch = tests.fetchpatch.simple.override { fetchpatch = (fetchpatch.override { fetchurl = useThisCurl fetchurl; }) // { version = 1; }; };
@ -210,7 +211,7 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.all;
# Fails to link against static brotli or gss
broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport);
broken = (stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport || stdenv.hostPlatform.system == "x86_64-darwin")) || rustlsSupport;
pkgConfigModules = [ "libcurl" ];
mainProgram = "curl";
};