From d2fa28391b922a7600ad9e3b11b9e066ede87c8c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Oct 2024 09:28:34 +0000
Subject: [PATCH 1/4] azpainter: 3.0.8 -> 3.0.9a

---
 pkgs/applications/graphics/azpainter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix
index b1493b94ce67..8400becbc1cd 100644
--- a/pkgs/applications/graphics/azpainter/default.nix
+++ b/pkgs/applications/graphics/azpainter/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "azpainter";
-  version = "3.0.8";
+  version = "3.0.9a";
 
   src = fetchFromGitLab {
     owner = "azelpg";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-NiQYX/Dcl/t30Jx08DKr6EP5ODS00pyEGKh/qiNT5t4=";
+    hash = "sha256-QWXlRbCGDk1DRtePeDM3tnbtkdlhbkn/oNTqHvmtEA4=";
   };
 
   nativeBuildInputs = [

From 2af1a249674b2a11593368937858a0b825dfeea0 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Tue, 15 Oct 2024 18:25:44 +0400
Subject: [PATCH 2/4] azpainter: migrate to by-name

---
 .../azpainter/default.nix => by-name/az/azpainter/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/graphics/azpainter/default.nix => by-name/az/azpainter/package.nix} (100%)

diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/by-name/az/azpainter/package.nix
similarity index 100%
rename from pkgs/applications/graphics/azpainter/default.nix
rename to pkgs/by-name/az/azpainter/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0b24c7f13ef..7ef41b31056b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28154,8 +28154,6 @@ with pkgs;
 
   ax25-tools = callPackage ../applications/radio/ax25-tools { };
 
-  azpainter = callPackage ../applications/graphics/azpainter { };
-
   bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker {
     stdenv = if stdenv.hostPlatform.isDarwin then
       darwin.apple_sdk_11_0.stdenv

From f671edcf3efe05d3c3755793312f1aa57d13819c Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Tue, 15 Oct 2024 18:28:29 +0400
Subject: [PATCH 3/4] azpainter: format with nixfmt-rfc-style

---
 pkgs/by-name/az/azpainter/package.nix | 42 ++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/az/azpainter/package.nix b/pkgs/by-name/az/azpainter/package.nix
index 8400becbc1cd..024a6a460832 100644
--- a/pkgs/by-name/az/azpainter/package.nix
+++ b/pkgs/by-name/az/azpainter/package.nix
@@ -1,10 +1,23 @@
-{ lib, stdenv, fetchFromGitLab
-, desktop-file-utils, shared-mime-info, ninja, pkg-config
-, libiconv
-, libX11, libXcursor, libXext, libXi
-, freetype, fontconfig
-, libjpeg, libpng, libtiff, libwebp
-, zlib
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  desktop-file-utils,
+  shared-mime-info,
+  ninja,
+  pkg-config,
+  libiconv,
+  libX11,
+  libXcursor,
+  libXext,
+  libXi,
+  freetype,
+  fontconfig,
+  libjpeg,
+  libpng,
+  libtiff,
+  libwebp,
+  zlib,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,15 +33,22 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     desktop-file-utils # for update-desktop-database
-    shared-mime-info   # for update-mime-info
+    shared-mime-info # for update-mime-info
     ninja
     pkg-config
   ];
 
   buildInputs = [
-    libX11 libXcursor libXext libXi
-    freetype fontconfig
-    libjpeg libpng libtiff libwebp
+    libX11
+    libXcursor
+    libXext
+    libXi
+    freetype
+    fontconfig
+    libjpeg
+    libpng
+    libtiff
+    libwebp
     zlib
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 

From 3d2d89f9ce7b6d064dc5b25da1e1df55ce8fb55c Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Tue, 15 Oct 2024 18:46:24 +0400
Subject: [PATCH 4/4] azpainter: add darwin bundle

---
 pkgs/by-name/az/azpainter/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/az/azpainter/package.nix b/pkgs/by-name/az/azpainter/package.nix
index 024a6a460832..dee38a7d7e8d 100644
--- a/pkgs/by-name/az/azpainter/package.nix
+++ b/pkgs/by-name/az/azpainter/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitLab,
   desktop-file-utils,
+  desktopToDarwinBundle,
   shared-mime-info,
   ninja,
   pkg-config,
@@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
     shared-mime-info # for update-mime-info
     ninja
     pkg-config
-  ];
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
 
   buildInputs = [
     libX11