Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion tools/dep_updaters/update-nixpkgs-pin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,16 @@ nix-instantiate -I "nixpkgs=$NIXPKGS_PIN_FILE" --eval --strict --json -E "
}
" | jq -r '"{
pkgs ? import ./pkgs.nix {
config.permittedInsecurePackages = [ \(.permittedInsecurePackages | if length > 0 then "\(map(@json) | join(" ")) " else "" end)];
config.permittedInsecurePackages = [\(
.permittedInsecurePackages |
if length == 0 then
" "
elif length == 1 then
" \(first | @json) "
else
"\n \(map(@json) | join("\n "))\n "
end
)];
},
}:

Expand Down
7 changes: 6 additions & 1 deletion tools/nix/openssl-matrix.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
pkgs ? import ./pkgs.nix {
config.permittedInsecurePackages = [ ];
config.permittedInsecurePackages = [
"openssl-1.1.1w"
"openssl-3.0.22"
];
},
}:

Expand All @@ -11,6 +14,8 @@
# Other OpenSSL variants we want to test for:
inherit (pkgs)
boringssl
openssl_1_1
openssl_3
openssl_3_6
openssl_4_0
;
Expand Down
6 changes: 6 additions & 0 deletions tools/nix/pkgs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ if builtins.currentSystem == "x86_64-darwin" then
else
nixpkgs
// {
# OpenSSL 1.1.x and 3.0.x were removed from unstable, we want to keep testing with it
inherit (import ./pkgs-26.05.nix arg)
openssl_1_1
openssl_3
;

# TODO: remove pin once https://github.com/mozilla/sccache/issues/2869 is resolved
sccache = nixpkgs.callPackage (builtins.fetchurl {
url = "${repo}/raw/aff8a0b28396750446e5537a96461bc4facdb287/pkgs/by-name/sc/sccache/package.nix";
Expand Down
Loading