From 8697fed9308a396e9799d5b7aaa0420717a45c30 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Wed, 29 Apr 2026 11:46:35 +0100 Subject: [PATCH] dawarich: remove openssl hotfix Ruby 3.4.8 updates the openssl gem, so the hotfix is no longer needed. --- .../da/dawarich/0002-openssl-hotfix.diff | 32 ------------------- pkgs/by-name/da/dawarich/package.nix | 4 --- 2 files changed, 36 deletions(-) delete mode 100644 pkgs/by-name/da/dawarich/0002-openssl-hotfix.diff diff --git a/pkgs/by-name/da/dawarich/0002-openssl-hotfix.diff b/pkgs/by-name/da/dawarich/0002-openssl-hotfix.diff deleted file mode 100644 index a17bea34279e..000000000000 --- a/pkgs/by-name/da/dawarich/0002-openssl-hotfix.diff +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/Gemfile b/Gemfile -index 36cf0d9c..fc914849 100644 ---- a/Gemfile -+++ b/Gemfile -@@ -28,6 +28,7 @@ gem 'omniauth-github', '~> 2.0.0' - gem 'omniauth-google-oauth2' - gem 'omniauth_openid_connect' - gem 'omniauth-rails_csrf_protection' -+gem 'openssl' - gem 'parallel' - gem 'pg' - gem 'prometheus_exporter' -diff --git a/Gemfile.lock b/Gemfile.lock -index a32eb801..b2fc45bc 100644 ---- a/Gemfile.lock -+++ b/Gemfile.lock -@@ -348,6 +348,7 @@ GEM - tzinfo - validate_url - webfinger (~> 2.0) -+ openssl (3.3.1) - optimist (3.2.1) - orm_adapter (0.5.0) - ostruct (0.6.1) -@@ -665,6 +666,7 @@ DEPENDENCIES - omniauth-google-oauth2 - omniauth-rails_csrf_protection - omniauth_openid_connect -+ openssl - parallel - pg - prometheus_exporter diff --git a/pkgs/by-name/da/dawarich/package.nix b/pkgs/by-name/da/dawarich/package.nix index 14e673531ebb..0bca95cd599c 100644 --- a/pkgs/by-name/da/dawarich/package.nix +++ b/pkgs/by-name/da/dawarich/package.nix @@ -35,10 +35,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # bundix and bundlerEnv fail with system-specific gems ./0001-build-ffi-gem.diff - # openssl 3.6.0 breaks ruby openssl gem - # See https://github.com/NixOS/nixpkgs/issues/456753 - # and https://github.com/ruby/openssl/issues/949#issuecomment-3370358680 - ./0002-openssl-hotfix.diff ]; postPatch = '' substituteInPlace ./Gemfile \