From 2776687f80fcfa8ab3e121ee1899aab477e0087b Mon Sep 17 00:00:00 2001
From: Johannes Fleck <jfleck@posteo.de>
Date: Thu, 27 Mar 2025 15:19:15 +0100
Subject: [PATCH 1/2] maintainers: add bohreromir

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e03316f08360..611fe4792449 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3342,6 +3342,11 @@
     githubId = 33910565;
     name = "Abdallah Gamal";
   };
+  bohreromir = {
+    github = "bohreromir";
+    githubId = 40412303;
+    name = "bohreromir";
+  };
   boj = {
     email = "brian@uncannyworks.com";
     github = "boj";

From 35def808e7460da4d685a31b2172473aeb77ac3c Mon Sep 17 00:00:00 2001
From: Johannes Fleck <jfleck@posteo.de>
Date: Thu, 27 Mar 2025 15:27:58 +0100
Subject: [PATCH 2/2] artisan: init at 3.1.0

---
 pkgs/by-name/ar/artisan/package.nix | 38 +++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 pkgs/by-name/ar/artisan/package.nix

diff --git a/pkgs/by-name/ar/artisan/package.nix b/pkgs/by-name/ar/artisan/package.nix
new file mode 100644
index 000000000000..4cd977e9dc6c
--- /dev/null
+++ b/pkgs/by-name/ar/artisan/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  appimageTools,
+  fetchurl,
+}:
+let
+  pname = "artisan";
+  version = "3.1.0";
+
+  src = fetchurl {
+    url = "https://github.com/artisan-roaster-scope/artisan/releases/download/v${version}/${pname}-linux-${version}.AppImage";
+    hash = "sha256-PkrqX2CflSCR1e+4Y4K12iuCrYqDMecD1vf8GKz1StQ=";
+  };
+
+  appimageContents = appimageTools.extract {
+    inherit pname version src;
+  };
+in
+appimageTools.wrapType2 {
+  inherit pname version src;
+
+  extraInstallCommands = ''
+    install -m 444 -D ${appimageContents}/org.artisan_scope.artisan.desktop $out/share/applications/org.artisan_scope.artisan.desktop
+    install -m 444 -D ${appimageContents}/artisan.png $out/share/applications/artisan.png
+  '';
+
+  meta = {
+    description = "visual scope for coffee roasters";
+    homepage = "https://artisan-scope.org/";
+    changelog = "https://github.com/artisan-roaster-scope/artisan/releases/tag/v${version}";
+    downloadPage = "https://github.com/artisan-roaster-scope/artisan/releases";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "artisan";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ bohreromir ];
+    platforms = [ "x86_64-linux" ];
+  };
+}