Skip to content

[Backport release-25.11] discourse: update openssl gem to >=3.3.1 and persist in update script #478355

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

Merged
leona-ya merged 1 commit into from
Jan 9, 2026
Merged

[Backport release-25.11] discourse: update openssl gem to >=3.3.1 and persist in update script #478355

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
1 change: 1 addition & 0 deletions pkgs/servers/web-apps/discourse/rubyEnv/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,3 +312,4 @@ gem "hashery", require: false
gem "ttfunk", require: false
gem "afm", require: false
gem "pdf-reader", require: false
gem "openssl", "~> 3.3.1"
5 changes: 3 additions & 2 deletions pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ GEM
omniauth-twitter (1.4.0)
omniauth-oauth (~> 1.1)
rack
openssl (3.3.0)
openssl (3.3.2)
openssl-signature_algorithm (1.3.0)
openssl (> 2.0)
optimist (3.2.1)
Expand Down Expand Up @@ -826,6 +826,7 @@ DEPENDENCIES
omniauth-google-oauth2
omniauth-oauth2
omniauth-twitter
openssl (~> 3.3.1)
parallel
parallel_tests
pdf-reader
Expand Down Expand Up @@ -1078,7 +1079,7 @@ CHECKSUMS
omniauth-oauth (1.2.1) sha256=25bf22c90234280fa825200490f03ff1ce7d76f1a4fbd6c882c6c5b169c58da8
omniauth-oauth2 (1.7.3) sha256=3f5a8f99fa72e0f91d2abd7475ceb972a4ae67ed59e049f314c0c1bad81f4745
omniauth-twitter (1.4.0) sha256=c5cc6c77cd767745ffa9ebbd5fbd694a3fa99d1d2d82a4d7def0bf3b6131b264
openssl (3.3.0) sha256=ff3a573fc97ab30f69483fddc80029f91669bf36532859bd182d1836f45aee79
openssl (3.3.2) sha256=7f4e01215dc9c4be1fca71d692406be3e6340b39c1f71a47fea9c497decd0f6c
openssl-signature_algorithm (1.3.0) sha256=a3b40b5e8276162d4a6e50c7c97cdaf1446f9b2c3946a6fa2c14628e0c957e80
optimist (3.2.1) sha256=8cf8a0fd69f3aa24ab48885d3a666717c27bc3d9edd6e976e18b9d771e72e34e
ostruct (0.6.3) sha256=95a2ed4a4bd1d190784e666b47b2d3f078e4a9efda2fccf18f84ddc6538ed912
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2125,10 +2125,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0ygfbbs3c61d32ymja2k6sznj5pr540cip9z91lhzcvsr4zmffpz";
sha256 = "0v0grpg9gi59zr3imxy1745k9rp3dd095mkir8gvxi69blhh2kkz";
type = "gem";
};
version = "3.3.0";
version = "3.3.2";
};
openssl-signature_algorithm = {
dependencies = [ "openssl" ];
Expand Down
5 changes: 5 additions & 0 deletions pkgs/servers/web-apps/discourse/update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,11 @@ def update(rev):
with open(rubyenv_dir / fn, 'w') as f:
f.write(repo.get_file(fn, version.tag))

# Workaround for https://github.com/NixOS/nixpkgs/pull/469624
# Can be removed when openssl gem is already new enough, i.e. with discourse 2025.11.1
with open(rubyenv_dir / "Gemfile", "a") as f:
f.write('gem "openssl", "~> 3.3.1"')

# work around https://github.com/nix-community/bundix/issues/8
os.environ["BUNDLE_FORCE_RUBY_PLATFORM"] = "true"
subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir)
Expand Down
Loading