File tree Expand file tree Collapse file tree 3 files changed +11
-3
lines changed
Expand file tree Collapse file tree 3 files changed +11
-3
lines changed Original file line number Diff line number Diff line change @@ -198,7 +198,7 @@ jobs:
198198 --arg ccache '(import <nixpkgs> {}).sccache' \
199199 --arg devTools '[]' \
200200 --arg benchmarkTools '[]' \
201- ${{ endsWith(matrix.system, '-darwin') && '--arg withAmaro false --arg withSQLite false --arg extraConfigFlags ''["--without-inspector" "--without-node-options"]'' \' || '\' }}
201+ ${{ endsWith(matrix.system, '-darwin') && '--arg withAmaro false --arg withQuic true --arg withSQLite false --arg extraConfigFlags ''["--without-inspector" "--without-node-options"]'' \' || '\' }}
202202 --run '
203203 make -C "$TAR_DIR" run-ci -j4 V=1 TEST_CI_ARGS="-p actions --measure-flakiness 9 --skip-tests=$CI_SKIP_TESTS"
204204 '
Original file line number Diff line number Diff line change 1313 # Build options
1414 icu ? pkgs . icu ,
1515 withAmaro ? true ,
16+ withQuic ? false ,
1617 withSQLite ? true ,
1718 withSSL ? true ,
1819 withTemporal ? false ,
1920 sharedLibDeps ? import ./tools/nix/sharedLibDeps.nix {
2021 inherit
2122 pkgs
23+ withQuic
2224 withSQLite
2325 withSSL
2426 withTemporal
@@ -81,6 +83,7 @@ pkgs.mkShell {
8183 ]
8284 ++ extraConfigFlags
8385 ++ pkgs . lib . optional ( ! withAmaro ) "--without-amaro"
86+ ++ pkgs . lib . optional withQuic "--experimental-quic"
8487 ++ pkgs . lib . optional ( ! withSQLite ) "--without-sqlite"
8588 ++ pkgs . lib . optional ( ! withSSL ) "--without-ssl"
8689 ++ pkgs . lib . optional withTemporal "--v8-enable-temporal-support"
Original file line number Diff line number Diff line change 11{
22 pkgs ? import ./pkgs.nix { } ,
3+ withQuic ? false ,
34 withSQLite ? true ,
45 withSSL ? true ,
56 withTemporal ? false ,
1213 gtest
1314 libuv
1415 nbytes
15- nghttp3
16- ngtcp2
1716 simdjson
1817 simdutf
1918 uvwasi
3332 ] ;
3433 } ;
3534}
35+ // ( pkgs . lib . optionalAttrs withQuic {
36+ inherit ( pkgs )
37+ nghttp3
38+ ngtcp2
39+ ;
40+ } )
3641// ( pkgs . lib . optionalAttrs withSQLite {
3742 inherit ( pkgs ) sqlite ;
3843} )
You can’t perform that action at this time.
0 commit comments