From cd11e6c7ed68a96445fd7e24fa82aeb7ae88be6d Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 12 Oct 2024 02:29:41 +0100 Subject: [PATCH] Revert "curl: disable fetchpatch passthru test on darwin" This was fixed at some point; I can reproduce the issue before the original commit, but not now. This reverts commit e6b37d5a61dd9e0e4780eaa36b42000257a38233. --- pkgs/tools/networking/curl/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 567ddcbf7d02..e00aecd50a22 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -202,6 +202,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; }) // { version = 1; }; }; curlpp = useThisCurl curlpp; coeurl = useThisCurl coeurl; haskell-curl = useThisCurl haskellPackages.curl; @@ -215,8 +216,6 @@ stdenv.mkDerivation (finalAttrs: { pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; } // lib.optionalAttrs (stdenv.hostPlatform.system != "x86_64-darwin") { static = pkgsStatic.curl; - } // lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { - fetchpatch = tests.fetchpatch.simple.override { fetchpatch = (fetchpatch.override { fetchurl = useThisCurl fetchurl; }) // { version = 1; }; }; }; };