commit 2eeeb214d659dcce2aed3252062f3abf5f0e443d · pyrox.dev/nixpkgs

+60

pkgs/by-name/ak/akkoma/akkoma-imagemagick.patch

···

       1
       1
       +
       From c48f5d57b6e57f42b668c0c6b8744e4620c77320 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Mikael Voss <mvs@nyantec.com>

     

       3
       3
       +
       Date: Tue, 19 Nov 2024 20:47:27 +0100

     

       4
       4
       +
       Subject: [PATCH] Use magick command from ImageMagick

     

       5
       5
       +
       

     

       6
       6
       +
       With ImageMagick version 7 the convert command has been deprecated in

     

       7
       7
       +
       favour of magick. Calling convert instead results in the logs being

     

       8
       8
       +
       spammed with warning messages.

     

       9
       9
       +
       

     

       10
       10
       +
       The mogrify Elixir wrapper also runs magick with the mogrify argument

     

       11
       11
       +
       in current releases.

     

       12
       12
       +
       ---

     

       13
       13
       +
        lib/pleroma/application_requirements.ex | 8 ++++----

     

       14
       14
       +
        lib/pleroma/helpers/media_helper.ex     | 4 ++--

     

       15
       15
       +
        2 files changed, 6 insertions(+), 6 deletions(-)

     

       16
       16
       +
       

     

       17
       17
       +
       diff --git a/lib/pleroma/application_requirements.ex b/lib/pleroma/application_requirements.ex

     

       18
       18
       +
       index c3777d8f1..55ee674a2 100644

     

       19
       19
       +
       --- a/lib/pleroma/application_requirements.ex

     

       20
       20
       +
       +++ b/lib/pleroma/application_requirements.ex

     

       21
       21
       +
       @@ -166,10 +166,10 @@ defp check_system_commands!(:ok) do

     

       22
       22
       +
            filter_commands_statuses = [

     

       23
       23
       +
              check_filter(Pleroma.Upload.Filter.Exiftool.StripMetadata, "exiftool"),

     

       24
       24
       +
              check_filter(Pleroma.Upload.Filter.Exiftool.ReadDescription, "exiftool"),

     

       25
       25
       +
       -      check_filter(Pleroma.Upload.Filter.Mogrify, "mogrify"),

     

       26
       26
       +
       -      check_filter(Pleroma.Upload.Filter.Mogrifun, "mogrify"),

     

       27
       27
       +
       -      check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "mogrify"),

     

       28
       28
       +
       -      check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "convert"),

     

       29
       29
       +
       +      check_filter(Pleroma.Upload.Filter.Mogrify, "magick"),

     

       30
       30
       +
       +      check_filter(Pleroma.Upload.Filter.Mogrifun, "magick"),

     

       31
       31
       +
       +      check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "magick"),

     

       32
       32
       +
       +      check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "magick"),

     

       33
       33
       +
              check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "ffprobe")

     

       34
       34
       +
            ]

     

       35
       35
       +
        

     

       36
       36
       +
       diff --git a/lib/pleroma/helpers/media_helper.ex b/lib/pleroma/helpers/media_helper.ex

     

       37
       37
       +
       index cb95d0e68..17cd9629d 100644

     

       38
       38
       +
       --- a/lib/pleroma/helpers/media_helper.ex

     

       39
       39
       +
       +++ b/lib/pleroma/helpers/media_helper.ex

     

       40
       40
       +
       @@ -12,7 +12,7 @@ defmodule Pleroma.Helpers.MediaHelper do

     

       41
       41
       +
          require Logger

     

       42
       42
       +
        

     

       43
       43
       +
          def missing_dependencies do

     

       44
       44
       +
       -    Enum.reduce([imagemagick: "convert", ffmpeg: "ffmpeg"], [], fn {sym, executable}, acc ->

     

       45
       45
       +
       +    Enum.reduce([imagemagick: "magick", ffmpeg: "ffmpeg"], [], fn {sym, executable}, acc ->

     

       46
       46
       +
              if Pleroma.Utils.command_available?(executable) do

     

       47
       47
       +
                acc

     

       48
       48
       +
              else

     

       49
       49
       +
       @@ -22,7 +22,7 @@ def missing_dependencies do

     

       50
       50
       +
          end

     

       51
       51
       +
        

     

       52
       52
       +
          def image_resize(url, options) do

     

       53
       53
       +
       -    with executable when is_binary(executable) <- System.find_executable("convert"),

     

       54
       54
       +
       +    with executable when is_binary(executable) <- System.find_executable("magick"),

     

       55
       55
       +
                 {:ok, args} <- prepare_image_resize_args(options),

     

       56
       56
       +
                 {:ok, env} <- HTTP.get(url, [], []),

     

       57
       57
       +
                 {:ok, fifo_path} <- mkfifo() do

     

       58
       58
       +
       -- 

     

       59
       59
       +
       2.43.0

     

       60
       60
       +

+10

pkgs/by-name/ak/akkoma/package.nix

···

       23
       23
        
         nativeBuildInputs = [ cmake ];

     

       24
       24
        
         buildInputs = [ file ];

     

       25
       25
        
       

     

       26
       26
       +
         patches = [

     

       27
       27
       +
           # See <https://akkoma.dev/AkkomaGang/akkoma/pulls/854>

     

       28
       28
       +
           # Akkoma uses the deprecated “convert” command instead of “magick”, which

     

       29
       29
       +
           # results in the logs being spammed with warning messages. Upstream is

     

       30
       30
       +
           # reluctant to change this, to ensure compatibility with Debian stable,

     

       31
       31
       +
           # which does not yet provide ImageMagick 7.

     

       32
       32
       +
           # Remove this patch once merged upstream.

     

       33
       33
       +
           ./akkoma-imagemagick.patch

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       26
       36
        
         mixFodDeps = beamPackages.fetchMixDeps {

     

       27
       37
        
           pname = "mix-deps-${pname}";

     

       28
       38
        
           inherit src version;