discourse: Enable jhead, which is no longer marked vulnerable

(cherry picked from commit ed8c4e01d985d115f8821106318afc65fc7eaf5f)

pkgs/servers/web-apps/discourse/default.nix

@@ -2,8 +2,9 @@
 , fetchFromGitHub, bundlerEnv, callPackage
 
 , ruby, replace, gzip, gnutar, git, cacert, util-linux, gawk
-, imagemagick, optipng, pngquant, libjpeg, jpegoptim, gifsicle, libpsl
+, imagemagick, optipng, pngquant, libjpeg, jpegoptim, gifsicle, jhead
-, redis, postgresql, which, brotli, procps, rsync, nodePackages, v8
+, libpsl, redis, postgresql, which, brotli, procps, rsync
+, nodePackages, v8
 
 , plugins ? []
 }@args:
@@ -41,6 +42,7 @@ let
     jpegoptim
     gifsicle
     nodePackages.svgo
+    jhead
   ];
 
   runtimeEnv = {
@@ -241,9 +243,6 @@ let
       # Add a noninteractive admin creation task
       ./admin_create.patch
 
-      # Disable jhead, which is currently marked as vulnerable
-      ./disable_jhead.patch
-
       # Add the path to the CA cert bundle to make TLS work
       ./action_mailer_ca_cert.patch
 

pkgs/servers/web-apps/discourse/disable_jhead.patch

@@ -1,12 +0,0 @@
-diff --git a/lib/file_helper.rb b/lib/file_helper.rb
-index d87da5a85e..f5323292d7 100644
---- a/lib/file_helper.rb
-+++ b/lib/file_helper.rb
-@@ -127,6 +127,7 @@ class FileHelper
-         jpegrecompress: false,
-         # Skip looking for gifsicle, svgo binaries
-         gifsicle: false,
-+        jhead: false,
-         svgo: false
-       )
-     end