From ee92f5fdc7b8966fb17dfa7d5e34580ffc2df7b4 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 26 Oct 2024 13:13:22 +0400
Subject: [PATCH 1/2] =?UTF-8?q?crow-translate:=203.0.0=20=E2=86=92=203.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/misc/crow-translate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix
index 84263380f11ae..71885b08c69e6 100644
--- a/pkgs/applications/misc/crow-translate/default.nix
+++ b/pkgs/applications/misc/crow-translate/default.nix
@@ -16,14 +16,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "crow-translate";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "office";
     repo = "crow-translate";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-hdrhxbv44DlxoF1JU1d2auP/vR8a3IJI+hN7PhdPMaY=";
+    hash = "sha256-zL+Ucw6rzIoEaBHi/uqKQB0cnR6aAcF8MPOG3hwK3iA=";
     fetchSubmodules = true;
   };
 

From 8bbaddb56d3ed555588a349a0c5463a7fe9559e1 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 26 Oct 2024 13:31:29 +0400
Subject: [PATCH 2/2] crow-translate: migrate to by-name

---
 .../cr/crow-translate/package.nix}            | 19 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 8 insertions(+), 13 deletions(-)
 rename pkgs/{applications/misc/crow-translate/default.nix => by-name/cr/crow-translate/package.nix} (86%)

diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/by-name/cr/crow-translate/package.nix
similarity index 86%
rename from pkgs/applications/misc/crow-translate/default.nix
rename to pkgs/by-name/cr/crow-translate/package.nix
index 71885b08c69e6..304a4dbac53a4 100644
--- a/pkgs/applications/misc/crow-translate/default.nix
+++ b/pkgs/by-name/cr/crow-translate/package.nix
@@ -3,13 +3,10 @@
 , fetchFromGitLab
 , cmake
 , extra-cmake-modules
-, qttools
-, kwayland
 , leptonica
+, libsForQt5
+, qt5
 , tesseract4
-, qtmultimedia
-, qtx11extras
-, wrapQtAppsHook
 , gst_all_1
 , testers
 }:
@@ -29,22 +26,22 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     substituteInPlace data/org.kde.CrowTranslate.desktop.in \
-      --subst-var-by QT_BIN_DIR ${lib.getBin qttools}/bin
+      --subst-var-by QT_BIN_DIR ${lib.getBin qt5.qttools}/bin
   '';
 
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
-    qttools
-    wrapQtAppsHook
+    qt5.qttools
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    kwayland
+    libsForQt5.kwayland
     leptonica
     tesseract4
-    qtmultimedia
-    qtx11extras
+    qt5.qtmultimedia
+    qt5.qtx11extras
   ] ++ (with gst_all_1; [
     gstreamer
     gst-plugins-base
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b71bc9b64539..19a7b98ba1697 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -537,8 +537,6 @@ with pkgs;
 
   crackql = callPackage ../tools/security/crackql { };
 
-  crow-translate = libsForQt5.callPackage ../applications/misc/crow-translate { };
-
   dae = callPackage ../tools/networking/dae { };
 
   darling = callPackage ../applications/emulators/darling { };