From 280f14490eeff5285e9f5e79b81869ce720546db Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 20 Mar 2023 12:03:21 +0100 Subject: [PATCH 1/2] curl: 7.88.1 -> 8.0.1 https://curl.se/changes.html#8_0_0 https://daniel.haxx.se/blog/2023/03/20/curl-8-0-0-is-here/ https://daniel.haxx.se/blog/2023/03/20/curl-8-0-1-because-i-jinxed-it/ Fixes: CVE-2023-27533, CVE-2023-27534, CVE-2023-27535, CVE-2023-27536, CVE-2023-27537, CVE-2023-27538 --- pkgs/tools/networking/curl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index fca190bde4ab..5979a32cac49 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -48,14 +48,14 @@ assert !(opensslSupport && wolfsslSupport); stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "7.88.1"; + version = "8.0.1"; src = fetchurl { urls = [ "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.bz2" "https://github.com/curl/curl/releases/download/curl-${finalAttrs.version}/curl-${finalAttrs.version}.tar.bz2" ]; - hash = "sha256-giS0XM4Sq94DnBLcBxG36oWxBLmtU01uTFtOGIphyQc="; + hash = "sha256-m2selrdI0EuWh4a2vfQHqlx1q1Oj03wcjIHNtzZVXM8="; }; patches = [ From 603cae0768edf341d75708f881f73abd04d8646d Mon Sep 17 00:00:00 2001 From: Artturi Date: Mon, 20 Mar 2023 16:37:09 +0100 Subject: [PATCH 2/2] curl: Fix passthru tests evaluation The override would previously clear the version attribute, which likely started happening after 41877098. Co-Authored-By: Martin Weinelt --- pkgs/tools/networking/curl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 5979a32cac49..3fc6d760bceb 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -168,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: { inherit opensslSupport openssl; tests = { withCheck = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; }); - fetchpatch = tests.fetchpatch.simple.override { fetchpatch = fetchpatch.override { fetchurl = useThisCurl fetchurl; }; }; + fetchpatch = tests.fetchpatch.simple.override { fetchpatch = (fetchpatch.override { fetchurl = useThisCurl fetchurl; }) // { version = 1; }; }; curlpp = useThisCurl curlpp; coeurl = useThisCurl coeurl; haskell-curl = useThisCurl haskellPackages.curl;