Commit f14ed76
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -29,16 +29,16 @@ mv "$TMP_FILE" "$NIXPKGS_PIN_FILE" | |||
| 29 | 29 | nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E " | |
| 30 | 30 | let | |
| 31 | 31 | 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\" ]; | ||
| 32 | 36 | attrs = builtins.filter | |
| 33 | 37 | (n: | |
| 34 | 38 | let t = builtins.tryEval pkgs.\${n}; in | |
| 35 | 39 | t.success && (builtins.tryEval t.value.version).success | |
| 36 | 40 | ) | |
| 37 | - ( | ||
| 38 | - builtins.filter | ||
| 39 | - (n: builtins.match \"openssl_[0-9]+(_[0-9]+)?\" n != null) | ||
| 40 | - (builtins.attrNames pkgs) | ||
| 41 | - ); | ||
| 41 | + (opensslAttrs ++ extraMatrixAttrs); | ||
| 42 | 42 | in | |
| 43 | 43 | { | |
| 44 | 44 | inherit attrs; | |
@@ -54,7 +54,7 @@ nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E " | |||
| 54 | 54 | ||
| 55 | 55 | { | |
| 56 | 56 | inherit (pkgs) | |
| 57 | - \(.attrs | join("\n ")) | ||
| 57 | + \(.attrs | sort | join("\n ")) | ||
| 58 | 58 | ; | |
| 59 | 59 | }"' > "$OPENSSL_MATRIX_FILE" | |
| 60 | 60 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -6,6 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | 7 | { | |
| 8 | 8 | inherit (pkgs) | |
| 9 | + boringssl | ||
| 9 | 10 | openssl_1_1 | |
| 10 | 11 | openssl_3 | |
| 11 | 12 | openssl_3_5 | |
0 commit comments