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

curl: put tests in tests.withCheck

Browse source 
curl is built many times during a stdenv rebuild

they are a bottleneck
This commit is contained in:
Artturin 2022-06-24 19:25:32 +03:00
parent 6bce3fc64e
commit 47b58ff43e
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/tools/networking/curl/default.nix
View file

@ -33,6 +33,8 @@
, ocamlPackages
, phpExtensions
, python3
, tests
, fetchpatch
}:
# Note: this package is used for bootstrapping fetchurl, and thus
@ -152,7 +154,10 @@ stdenv.mkDerivation (finalAttrs: {
CXX = "${stdenv.cc.targetPrefix}c++";
CXXCPP = "${stdenv.cc.targetPrefix}c++ -E";
doCheck = true;
# takes 14 minutes on a 24 core and because many other packages depend on curl
# they cannot be run concurrently and are a bottleneck
# tests are available in passthru.tests.withCheck
doCheck = false;
preCheck = ''
patchShebangs tests/
'' + lib.optionalString stdenv.isDarwin ''
@ -182,6 +187,8 @@ stdenv.mkDerivation (finalAttrs: {
in {
inherit opensslSupport openssl;
tests = {
withCheck = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; });
fetchpatch = tests.fetchpatch.simple.override { fetchpatch = fetchpatch.override { fetchurl = useThisCurl fetchurl; }; };
curlpp = useThisCurl curlpp;
coeurl = useThisCurl coeurl;
haskell-curl = useThisCurl haskellPackages.curl;