Skip to content

Patch openssl gem in ruby 3.1+ for openssl 3.6 support #200

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

Open
joshheinrichs-shopify wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Patch openssl gem in ruby 3.1+ for openssl 3.6 support #200

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
39 changes: 39 additions & 0 deletions ruby/overrides.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,28 @@
{ versionComparison
, openssl_1_1
, stdenv
, fetchFromGitHub
}:
let
opensslGem_3_1_2 = fetchFromGitHub {
owner = "ruby";
repo = "openssl";
rev = "v3.1.2";
hash = "sha256-LAVgwwZtYe4iIL2agdMeeNq0DzLu5x+AyvoKb95wFcU=";
};
opensslGem_3_2_2 = fetchFromGitHub {
owner = "ruby";
repo = "openssl";
rev = "v3.2.2";
hash = "sha256-q3e6JBauJ/j2ds2mR7mtjc00aS3o3yAncv+SPkafB9M=";
};
opensslGem_3_3_1 = fetchFromGitHub {
owner = "ruby";
repo = "openssl";
rev = "v3.3.1";
hash = "sha256-1QillscdCzY0hFtH0dcbiAiu4WZMV2XqiMBDZ/UMXZE=";
};
in
[
# Some of the older versions do not build.
{
Expand Down Expand Up @@ -101,6 +122,24 @@
lessThan "3.1";
override = pkg: pkg.override { openssl = openssl_1_1; };
}
# Ruby 3.1+ needs updated openssl gem versions for OpenSSL 3.6 support.
# https://github.com/ruby/openssl/issues/949
{
condition = version: with versionComparison version;
greaterOrEqualTo "3.1" && lessOrEqualTo "3.2.9";
override = pkg: pkg.override { opensslGem = opensslGem_3_1_2; };
}
{
condition = version: with versionComparison version;
greaterOrEqualTo "3.3" && lessOrEqualTo "3.3.9";
override = pkg: pkg.override { opensslGem = opensslGem_3_2_2; };
}
{
condition = version: with versionComparison version;
(greaterOrEqualTo "3.4" && lessOrEqualTo "3.4.7")
|| version == "3.5.0-preview1";
override = pkg: pkg.override { opensslGem = opensslGem_3_3_1; };
}
# Ruby nowadays uses an convention for libDir = MAJOR.MINOR.0.
# This wasn't the case for Ruby < 3.
{
Expand Down
9 changes: 9 additions & 0 deletions ruby/package-fn.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
, versionSource
, libDir ? "${(import ./parse-version.nix version).majMin}.0"
, rubygems ? null
, opensslGem ? null
, stdenv
, buildPackages
, lib
Expand Down Expand Up @@ -89,6 +90,14 @@ let

enableParallelBuilding = true;

postUnpack = opString (opensslGem != null) ''
rm -rf $sourceRoot/ext/openssl
mkdir -p $sourceRoot/ext/openssl
cp -r ${opensslGem}/ext/openssl $sourceRoot/ext/
cp -r ${opensslGem}/lib/ $sourceRoot/ext/openssl/
cp -r ${opensslGem}/{History.md,openssl.gemspec} $sourceRoot/ext/openssl/
'';

postPatch = ''
${opString (rubygems != null) ''
cp -rL --no-preserve=mode,ownership ${rubygems} ./rubygems
Expand Down
Loading