From 45a9c5600be4d3dc09e8e09f99c69d58f6eda284 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 27 Jan 2026 20:03:59 +0100 Subject: [PATCH 1/2] tools: update OpenSSL to 3.5.5 in `test-shared` --- tools/nix/sharedLibDeps.nix | 55 ++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/tools/nix/sharedLibDeps.nix b/tools/nix/sharedLibDeps.nix index 7a7d10828fb853..a0755bc5f8319b 100644 --- a/tools/nix/sharedLibDeps.nix +++ b/tools/nix/sharedLibDeps.nix @@ -36,25 +36,42 @@ // (pkgs.lib.optionalAttrs withSQLite { inherit (pkgs) sqlite; }) -// (pkgs.lib.optionalAttrs withSSL { - openssl = pkgs.openssl.overrideAttrs (old: { - version = "3.5.4"; - src = pkgs.fetchurl { - url = builtins.replaceStrings [ old.version ] [ "3.5.4" ] old.src.url; - hash = "sha256-lnMR+ElVMWlpvbHY1LmDcY70IzhjnGIexMNP3e81Xpk="; - }; - doCheck = false; - configureFlags = (old.configureFlags or [ ]) ++ [ - "no-docs" - "no-tests" - ]; - outputs = [ - "bin" - "out" - "dev" - ]; - }); -}) +// (pkgs.lib.optionalAttrs withSSL ( + let + version = "3.5.5"; + opensslSrc = "/pkgs/development/libraries/openssl/"; + inherit + (pkgs.callPackage "${ + pkgs.fetchgit { + url = "https://github.com/NixOS/nixpkgs.git"; + rev = "a5b50d31e0fd60227495ad2b2760cbda3581ec77"; + sparseCheckout = [ opensslSrc ]; + hash = "sha256-mo5RQGyLuZlf84k9eOn576b0SuC8Qd9MFMYKQcmewPc="; + } + }${opensslSrc}" { }) + openssl_3_6 + ; + in + { + openssl = openssl_3_6.overrideAttrs (old: { + inherit version; + src = pkgs.fetchurl { + url = builtins.replaceStrings [ old.version ] [ version ] old.src.url; + hash = "sha256-soyRUyqLZaH5g7TCi3SIF05KAQCOKc6Oab14nyi8Kok="; + }; + doCheck = false; + configureFlags = (old.configureFlags or [ ]) ++ [ + "no-docs" + "no-tests" + ]; + outputs = [ + "bin" + "out" + "dev" + ]; + }); + } +)) // (pkgs.lib.optionalAttrs withTemporal { inherit (pkgs) temporal_capi; }) From a35c509e7d78e3e5058633f080e959f651e67a0a Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 28 Jan 2026 14:12:57 +0100 Subject: [PATCH 2/2] fixup! tools: update OpenSSL to 3.5.5 in `test-shared` --- tools/nix/sharedLibDeps.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/nix/sharedLibDeps.nix b/tools/nix/sharedLibDeps.nix index a0755bc5f8319b..378d7543f970e4 100644 --- a/tools/nix/sharedLibDeps.nix +++ b/tools/nix/sharedLibDeps.nix @@ -46,7 +46,8 @@ url = "https://github.com/NixOS/nixpkgs.git"; rev = "a5b50d31e0fd60227495ad2b2760cbda3581ec77"; sparseCheckout = [ opensslSrc ]; - hash = "sha256-mo5RQGyLuZlf84k9eOn576b0SuC8Qd9MFMYKQcmewPc="; + nonConeMode = true; + hash = "sha256-Qo3IoUeccGO2GxFSYufyYjZmN5LGSek0z82pN73YXic="; } }${opensslSrc}" { }) openssl_3_6