File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 5858 run : |
5959 nix-shell \
6060 -I "nixpkgs=$TAR_DIR/tools/nix/pkgs.nix" \
61- --pure --keep TAR_DIR --keep FLAKY_TESTS --keep NIXPKGS_ALLOW_INSECURE \
61+ --pure --keep TAR_DIR --keep FLAKY_TESTS \
6262 --keep SCCACHE_GHA_ENABLED --keep ACTIONS_CACHE_SERVICE_V2 --keep ACTIONS_RESULTS_URL --keep ACTIONS_RUNTIME_TOKEN \
6363 --arg loadJSBuiltinsDynamically false \
6464 --arg useSeparateDerivationForV8 true \
Original file line number Diff line number Diff line change @@ -211,9 +211,7 @@ jobs:
211211 continue-on-error : ${{ matrix.openssl['continue-on-error'] }}
212212 env :
213213 OPENSSL_ATTR : ${{ matrix.openssl.attr }}
214- # Some EOL-with-extended-support cycles (e.g. 1.1.1) are marked
215- # insecure by nixpkgs' meta check and refuse to evaluate without this.
216- NIXPKGS_ALLOW_INSECURE : ' 1'
214+ OPENSSL_VERSION : ${{ matrix.openssl.version }}
217215 steps :
218216 - uses : actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
219217 with :
@@ -226,4 +224,7 @@ jobs:
226224 # Override just the `openssl` attr of the default shared-lib set with
227225 # the matrix-selected nixpkgs attribute (e.g. `openssl_3_6`). All
228226 # other shared libs (brotli, cares, libuv, …) keep their defaults.
229- extra-nix-args : --arg sharedLibDeps "(import $TAR_DIR/tools/nix/sharedLibDeps.nix {}) // { openssl = (import $TAR_DIR/tools/nix/pkgs.nix {}).$OPENSSL_ATTR; }"
227+ # `permittedInsecurePackages` whitelists just the matrix-selected
228+ # release (e.g. `openssl-1.1.1w`) so EOL-with-extended-support
229+ # cycles evaluate without relaxing nixpkgs' meta check globally.
230+ extra-nix-args : --arg sharedLibDeps "(import $TAR_DIR/tools/nix/sharedLibDeps.nix {}) // { openssl = (import $TAR_DIR/tools/nix/pkgs.nix { config.permittedInsecurePackages = [ \"openssl-$OPENSSL_VERSION\" ]; }).$OPENSSL_ATTR; }"
You can’t perform that action at this time.
0 commit comments