Skip to content

tools: add opensslVersion parameter to nix-shell #62465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
panva wants to merge 1 commit into from
+44 −10
Closed

tools: add opensslVersion parameter to nix-shell #62465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
withSQLite ? true,
withSSL ? true,
withTemporal ? false,
opensslVersion ? "3.5", # "1.1", "3.0", "3.5", "3.6", or null for bundled
sharedLibDeps ?
let
d = import ./tools/nix/sharedLibDeps.nix {
Expand All @@ -28,6 +29,7 @@
withSQLite
withSSL
withTemporal
opensslVersion
;
};
in
Expand Down
52 changes: 42 additions & 10 deletions tools/nix/sharedLibDeps.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
withSQLite ? true,
withSSL ? true,
withTemporal ? false,
opensslVersion ? "3.5",
}:
{
inherit (pkgs)
Expand Down Expand Up @@ -46,22 +47,53 @@
// (pkgs.lib.optionalAttrs withSQLite {
inherit (pkgs) sqlite;
})
// (pkgs.lib.optionalAttrs withSSL (
// (pkgs.lib.optionalAttrs (withSSL && opensslVersion != null) (
let
version = "3.5.5";
opensslVersions = {
"1.1" = {
base = pkgs.openssl_1_1;
version = "1.1.1w";
hash = "sha256-zzCYlQy02FOtlcCEHx+cbT3BAtzPys1SHZOSUgi3asg=";
configureFlags = [ "no-tests" ];
};
"3.0" = {
base = pkgs.openssl_3;
version = "3.0.19";
hash = "sha256-+lpBQ7iq4YvlPvLzyvKaLgdHQwuLx00y2IM1uUq2MHI=";
configureFlags = [ "no-tests" ];
};
"3.5" = {
base = pkgs.openssl_3_5;
version = "3.5.5";
hash = "sha256-soyRUyqLZaH5g7TCi3SIF05KAQCOKc6Oab14nyi8Kok=";
configureFlags = [
"no-docs"
"no-tests"
];
};
"3.6" = {
base = pkgs.openssl_3_6;
version = "3.6.1";
hash = "sha256-sb/tzVson/Iq7ofJ1gD1FXZ+v0X3cWjLbWTyMfUYqC4=";
configureFlags = [
"no-docs"
"no-tests"
];
};
};
selected =
opensslVersions.${opensslVersion}
or (throw "Unsupported opensslVersion: ${opensslVersion}. Use \"1.1\", \"3.0\", \"3.5\", \"3.6\", or null for bundled.");
in
{
openssl = pkgs.openssl_3_6.overrideAttrs (old: {
inherit version;
openssl = selected.base.overrideAttrs (old: {
version = selected.version;
src = pkgs.fetchurl {
url = builtins.replaceStrings [ old.version ] [ version ] old.src.url;
hash = "sha256-soyRUyqLZaH5g7TCi3SIF05KAQCOKc6Oab14nyi8Kok=";
url = builtins.replaceStrings [ old.version ] [ selected.version ] old.src.url;
hash = selected.hash;
};
doCheck = false;
configureFlags = (old.configureFlags or [ ]) ++ [
"no-docs"
"no-tests"
];
configureFlags = (old.configureFlags or [ ]) ++ selected.configureFlags;
outputs = [
"bin"
"out"
Expand Down
Loading