From daff458644db36d67476e4637baa15d7bebac82f Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Wed, 16 Apr 2025 15:02:32 +0200
Subject: [PATCH 1/2] inkcut: move to pkgs/by-name

---
 .../inkcut/default.nix => by-name/in/inkcut/package.nix}    | 6 +++---
 pkgs/top-level/all-packages.nix                             | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)
 rename pkgs/{applications/misc/inkcut/default.nix => by-name/in/inkcut/package.nix} (95%)

diff --git a/pkgs/applications/misc/inkcut/default.nix b/pkgs/by-name/in/inkcut/package.nix
similarity index 95%
rename from pkgs/applications/misc/inkcut/default.nix
rename to pkgs/by-name/in/inkcut/package.nix
index cf0a61e62fbc..8388db0abcc6 100644
--- a/pkgs/applications/misc/inkcut/default.nix
+++ b/pkgs/by-name/in/inkcut/package.nix
@@ -3,7 +3,7 @@
   fetchpatch,
   python3,
   fetchFromGitHub,
-  wrapQtAppsHook,
+  qt5,
   cups,
 }:
 
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = pname;
     repo = pname;
     tag = "v${version}";
-    sha256 = "sha256-S5IrNWVoUp1w+P7DrKlOUOyY3Q16CHSct9ndZOB3UpU=";
+    hash = "sha256-S5IrNWVoUp1w+P7DrKlOUOyY3Q16CHSct9ndZOB3UpU=";
   };
 
   patches = [
@@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec {
       --replace ", 'lpr', " ", '${cups}/bin/lpr', "
   '';
 
-  nativeBuildInputs = [ wrapQtAppsHook ];
+  nativeBuildInputs = [ qt5.wrapQtAppsHook ];
 
   propagatedBuildInputs = with python3.pkgs; [
     enamlx
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44ec2f5dc1f3..62972d924d3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14914,8 +14914,6 @@ with pkgs;
 
   imgp = python3Packages.callPackage ../applications/graphics/imgp { };
 
-  inkcut = libsForQt5.callPackage ../applications/misc/inkcut { };
-
   inkscape = callPackage ../applications/graphics/inkscape {
     lcms = lcms2;
   };

From b0eac382e2e168b1a5c59337f83d88d441ce5de4 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Wed, 16 Apr 2025 15:05:19 +0200
Subject: [PATCH 2/2] inkcut: 2.1.5 -> 2.1.6

Unfortunately this may make inkcut refuse to start if you have old stuff
in you `~/.config/inkcut`, but that seems like an upstream problem,
https://github.com/inkcut/inkcut/issues/398
---
 pkgs/by-name/in/inkcut/package.nix | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/in/inkcut/package.nix b/pkgs/by-name/in/inkcut/package.nix
index 8388db0abcc6..9fcc2c5dc567 100644
--- a/pkgs/by-name/in/inkcut/package.nix
+++ b/pkgs/by-name/in/inkcut/package.nix
@@ -9,37 +9,15 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "inkcut";
-  version = "2.1.5";
+  version = "2.1.6";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-S5IrNWVoUp1w+P7DrKlOUOyY3Q16CHSct9ndZOB3UpU=";
+    hash = "sha256-qfgzJTFr4VTV/x4PVnUKJzIndfjXB8z2jTWLXvadBuY=";
   };
 
-  patches = [
-    # fix opening the extension on inkscape 1.2
-    # https://github.com/inkcut/inkcut/pull/340
-    (fetchpatch {
-      url = "https://github.com/inkcut/inkcut/commit/d5d5d0ab3c588c576b668f4c7b07a10609ba2fd0.patch";
-      hash = "sha256-szfiOujuV7OOwYK/OU51m9FK6dzkbWds+h0cr5dGIg4=";
-    })
-    # fix loading a document from stdin (as used from the extension)
-    # https://github.com/inkcut/inkcut/issues/341
-    (fetchpatch {
-      url = "https://github.com/inkcut/inkcut/commit/748ab4157f87afec37dadd715094e87d02c9c739.patch";
-      hash = "sha256-ZGiwZru2bUYu749YSz5vxmGwLTAoYIAsafcX6PmdbYo=";
-      revert = true;
-    })
-    # fix distutils deprecation error
-    # https://github.com/inkcut/inkcut/pull/343
-    (fetchpatch {
-      url = "https://github.com/inkcut/inkcut/commit/9fb95204981bcc51401a1bc10caa02d1fae0d6cb.patch";
-      hash = "sha256-nriys7IWPGykZjVz+DIDsE9Tm40DewkHQlIUaxFwtzM=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace inkcut/device/transports/printer/plugin.py \
       --replace ", 'lpr', " ", '${cups}/bin/lpr', "