Skip to content

Commit 1cc08f4

Browse files
committed
avoid global NIXPKGS_ALLOW_INSECURE
1 parent 3c0756b commit 1cc08f4

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

.github/actions/build-shared/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ runs:
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 \

.github/workflows/test-shared.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff 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; }"

0 commit comments

Comments
 (0)