Skip to content

Commit bb7c845

Browse files
authored
tools: update OpenSSL to 3.5.5 in test-shared
PR-URL: #61551 Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 7bd2fea commit bb7c845

File tree

1 file changed

+37
-19
lines changed

1 file changed

+37
-19
lines changed

tools/nix/sharedLibDeps.nix

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,25 +45,43 @@
4545
// (pkgs.lib.optionalAttrs withSQLite {
4646
inherit (pkgs) sqlite;
4747
})
48-
// (pkgs.lib.optionalAttrs withSSL {
49-
openssl = pkgs.openssl.overrideAttrs (old: {
50-
version = "3.5.4";
51-
src = pkgs.fetchurl {
52-
url = builtins.replaceStrings [ old.version ] [ "3.5.4" ] old.src.url;
53-
hash = "sha256-lnMR+ElVMWlpvbHY1LmDcY70IzhjnGIexMNP3e81Xpk=";
54-
};
55-
doCheck = false;
56-
configureFlags = (old.configureFlags or [ ]) ++ [
57-
"no-docs"
58-
"no-tests"
59-
];
60-
outputs = [
61-
"bin"
62-
"out"
63-
"dev"
64-
];
65-
});
66-
})
48+
// (pkgs.lib.optionalAttrs withSSL (
49+
let
50+
version = "3.5.5";
51+
opensslSrc = "/pkgs/development/libraries/openssl/";
52+
inherit
53+
(pkgs.callPackage "${
54+
pkgs.fetchgit {
55+
url = "https://github.com/NixOS/nixpkgs.git";
56+
rev = "a5b50d31e0fd60227495ad2b2760cbda3581ec77";
57+
sparseCheckout = [ opensslSrc ];
58+
nonConeMode = true;
59+
hash = "sha256-Qo3IoUeccGO2GxFSYufyYjZmN5LGSek0z82pN73YXic=";
60+
}
61+
}${opensslSrc}" { })
62+
openssl_3_6
63+
;
64+
in
65+
{
66+
openssl = openssl_3_6.overrideAttrs (old: {
67+
inherit version;
68+
src = pkgs.fetchurl {
69+
url = builtins.replaceStrings [ old.version ] [ version ] old.src.url;
70+
hash = "sha256-soyRUyqLZaH5g7TCi3SIF05KAQCOKc6Oab14nyi8Kok=";
71+
};
72+
doCheck = false;
73+
configureFlags = (old.configureFlags or [ ]) ++ [
74+
"no-docs"
75+
"no-tests"
76+
];
77+
outputs = [
78+
"bin"
79+
"out"
80+
"dev"
81+
];
82+
});
83+
}
84+
))
6785
// (pkgs.lib.optionalAttrs withTemporal {
6886
inherit (pkgs) temporal_capi;
6987
})

0 commit comments

Comments
 (0)