Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 2fedc03

Browse filesBrowse files
committed
tools: update OpenSSL to 3.5.5 in test-shared
PR-URL: #61551 Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent eaa9a96 commit 2fedc03
Copy full SHA for 2fedc03

1 file changed

+37-19Lines changed: 37 additions & 19 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎tools/nix/sharedLibDeps.nix‎

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

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.