From e44b2e8d0d8d4c8638d1f0169a0f8924d6d8d8b1 Mon Sep 17 00:00:00 2001 From: larshalvorhansen Date: Sat, 17 May 2025 22:47:09 +0200 Subject: [PATCH] treewide: convert 2 instances of 'convert' into 'magick' --- hosts/bekkalokk/services/mediawiki/default.nix | 2 +- hosts/bekkalokk/services/website/fetch-gallery.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/bekkalokk/services/mediawiki/default.nix b/hosts/bekkalokk/services/mediawiki/default.nix index dc838a3..0ce5a69 100644 --- a/hosts/bekkalokk/services/mediawiki/default.nix +++ b/hosts/bekkalokk/services/mediawiki/default.nix @@ -214,7 +214,7 @@ in { "= /favicon.ico".alias = pkgs.runCommandLocal "mediawiki-favicon.ico" { buildInputs = with pkgs; [ imagemagick ]; } '' - convert \ + magick \ -resize x64 \ -gravity center \ -crop 64x64+0+0 \ diff --git a/hosts/bekkalokk/services/website/fetch-gallery.nix b/hosts/bekkalokk/services/website/fetch-gallery.nix index a96d70e..3061816 100644 --- a/hosts/bekkalokk/services/website/fetch-gallery.nix +++ b/hosts/bekkalokk/services/website/fetch-gallery.nix @@ -53,7 +53,7 @@ in { echo "Creating thumbnail for $fname" mkdir -p $(dirname ".thumbnails/$fname") - convert -define jpeg:size=200x200 "$fname" -thumbnail 300 -auto-orient ".thumbnails/$fname.png" ||: + magick -define jpeg:size=200x200 "$fname" -thumbnail 300 -auto-orient ".thumbnails/$fname.png" ||: touch -m -d "$(date -R -r "$fname")" ".thumbnails/$fname.png" done <<< "$images" '';