Skip to content

Commit 1a02250

Browse files
panvanodejs-github-bot
authored andcommitted
tools: add boringssl to tools/nix/openssl-matrix.nix
Signed-off-by: Filip Skokan <panva.ip@gmail.com> PR-URL: #63206 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent e107f3c commit 1a02250

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

tools/dep_updaters/update-nixpkgs-pin.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ mv "$TMP_FILE" "$NIXPKGS_PIN_FILE"
2929
nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E "
3030
let
3131
pkgs = import <nixpkgs> {};
32+
opensslAttrs = builtins.filter
33+
(n: builtins.match \"openssl_[0-9]+(_[0-9]+)?\" n != null)
34+
(builtins.attrNames pkgs);
35+
extraMatrixAttrs = [ \"boringssl\" ];
3236
attrs = builtins.filter
3337
(n:
3438
let t = builtins.tryEval pkgs.\${n}; in
3539
t.success && (builtins.tryEval t.value.version).success
3640
)
37-
(
38-
builtins.filter
39-
(n: builtins.match \"openssl_[0-9]+(_[0-9]+)?\" n != null)
40-
(builtins.attrNames pkgs)
41-
);
41+
(opensslAttrs ++ extraMatrixAttrs);
4242
in
4343
{
4444
inherit attrs;
@@ -54,7 +54,7 @@ nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E "
5454
5555
{
5656
inherit (pkgs)
57-
\(.attrs | join("\n "))
57+
\(.attrs | sort | join("\n "))
5858
;
5959
}"' > "$OPENSSL_MATRIX_FILE"
6060

tools/nix/openssl-matrix.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
{
88
inherit (pkgs)
9+
boringssl
910
openssl_1_1
1011
openssl_3
1112
openssl_3_5

0 commit comments

Comments
 (0)