From 3e398600381ccd518fb43bea3ec81cb0360efb43 Mon Sep 17 00:00:00 2001
From: yaya <github@uwu.is>
Date: Tue, 5 May 2026 12:23:59 +0200
Subject: [PATCH] akkoma: 3.18.1 -> 3.19.0

https://akkoma.dev/AkkomaGang/akkoma/src/tag/v3.19.0/CHANGELOG.md
---
 .../ak/akkoma/akkoma-imagemagick.patch        | 60 -------------------
 pkgs/by-name/ak/akkoma/package.nix            | 16 +----
 2 files changed, 3 insertions(+), 73 deletions(-)
 delete mode 100644 pkgs/by-name/ak/akkoma/akkoma-imagemagick.patch

diff --git a/pkgs/by-name/ak/akkoma/akkoma-imagemagick.patch b/pkgs/by-name/ak/akkoma/akkoma-imagemagick.patch
deleted file mode 100644
index 11e291f6dbc5..000000000000
--- a/pkgs/by-name/ak/akkoma/akkoma-imagemagick.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From c48f5d57b6e57f42b668c0c6b8744e4620c77320 Mon Sep 17 00:00:00 2001
-From: Mikael Voss <mvs@nyantec.com>
-Date: Tue, 19 Nov 2024 20:47:27 +0100
-Subject: [PATCH] Use magick command from ImageMagick
-
-With ImageMagick version 7 the convert command has been deprecated in
-favour of magick. Calling convert instead results in the logs being
-spammed with warning messages.
-
-The mogrify Elixir wrapper also runs magick with the mogrify argument
-in current releases.
----
- lib/pleroma/application_requirements.ex | 8 ++++----
- lib/pleroma/helpers/media_helper.ex     | 4 ++--
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/lib/pleroma/application_requirements.ex b/lib/pleroma/application_requirements.ex
-index c3777d8f1..55ee674a2 100644
---- a/lib/pleroma/application_requirements.ex
-+++ b/lib/pleroma/application_requirements.ex
-@@ -166,10 +166,10 @@ defp check_system_commands!(:ok) do
-     filter_commands_statuses = [
-       check_filter(Pleroma.Upload.Filter.Exiftool.StripMetadata, "exiftool"),
-       check_filter(Pleroma.Upload.Filter.Exiftool.ReadDescription, "exiftool"),
--      check_filter(Pleroma.Upload.Filter.Mogrify, "mogrify"),
--      check_filter(Pleroma.Upload.Filter.Mogrifun, "mogrify"),
--      check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "mogrify"),
--      check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "convert"),
-+      check_filter(Pleroma.Upload.Filter.Mogrify, "magick"),
-+      check_filter(Pleroma.Upload.Filter.Mogrifun, "magick"),
-+      check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "magick"),
-+      check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "magick"),
-       check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "ffprobe")
-     ]
- 
-diff --git a/lib/pleroma/helpers/media_helper.ex b/lib/pleroma/helpers/media_helper.ex
-index cb95d0e68..17cd9629d 100644
---- a/lib/pleroma/helpers/media_helper.ex
-+++ b/lib/pleroma/helpers/media_helper.ex
-@@ -12,7 +12,7 @@ defmodule Pleroma.Helpers.MediaHelper do
-   require Logger
- 
-   def missing_dependencies do
--    Enum.reduce([imagemagick: "convert", ffmpeg: "ffmpeg"], [], fn {sym, executable}, acc ->
-+    Enum.reduce([imagemagick: "magick", ffmpeg: "ffmpeg"], [], fn {sym, executable}, acc ->
-       if Pleroma.Utils.command_available?(executable) do
-         acc
-       else
-@@ -22,7 +22,7 @@ def missing_dependencies do
-   end
- 
-   def image_resize(url, options) do
--    with executable when is_binary(executable) <- System.find_executable("convert"),
-+    with executable when is_binary(executable) <- System.find_executable("magick"),
-          {:ok, args} <- prepare_image_resize_args(options),
-          {:ok, env} <- HTTP.get(url, [], []),
-          {:ok, fifo_path} <- mkfifo() do
--- 
-2.43.0
-
diff --git a/pkgs/by-name/ak/akkoma/package.nix b/pkgs/by-name/ak/akkoma/package.nix
index c2568cc4c6f3..f5ebc61c42fd 100644
--- a/pkgs/by-name/ak/akkoma/package.nix
+++ b/pkgs/by-name/ak/akkoma/package.nix
@@ -20,14 +20,14 @@ let
 in
 beamPackages.mixRelease rec {
   pname = "akkoma";
-  version = "3.18.1";
+  version = "3.19.0";
 
   src = fetchFromGitea {
     domain = "akkoma.dev";
     owner = "AkkomaGang";
     repo = "akkoma";
     tag = "v${version}";
-    hash = "sha256-4HIIgTNcNAMCpHyT6zBcmxXeFbMrt38Z7PtT9Onvz+U=";
+    hash = "sha256-ASLnsmuWpfQKwpNNLUgI32Gdn/j+jUW5IBLlT8RUmcE=";
 
     # upstream repository archive fetching is broken
     forceFetchGit = true;
@@ -36,20 +36,10 @@ beamPackages.mixRelease rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ file ];
 
-  patches = [
-    # See <https://akkoma.dev/AkkomaGang/akkoma/pulls/854>
-    # Akkoma uses the deprecated “convert” command instead of “magick”, which
-    # results in the logs being spammed with warning messages. Upstream is
-    # reluctant to change this, to ensure compatibility with Debian stable,
-    # which does not yet provide ImageMagick 7.
-    # Remove this patch once merged upstream.
-    ./akkoma-imagemagick.patch
-  ];
-
   mixFodDeps = beamPackages.fetchMixDeps {
     pname = "mix-deps-akkoma";
     inherit src version;
-    hash = "sha256-igXEX6I+7G7tNCLjEf0VBOaii0r7jXCdF6x78LMcUv0=";
+    hash = "sha256-O9A7XuQSSczGMcLMc6Fk0eh7PkjQ6sYJKSwdqoEPJJI=";
 
     postInstall = ''
       substituteInPlace "$out/http_signatures/mix.exs" \