From ca99a0b04cd92ada6bba417d8a915935e7f1057d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 5 Apr 2026 07:36:35 -0500
Subject: [PATCH 1/2] datovka: migrate to by-name

---
 .../da/datovka/package.nix}                      | 16 ++++++----------
 pkgs/top-level/all-packages.nix                  |  2 --
 2 files changed, 6 insertions(+), 12 deletions(-)
 rename pkgs/{applications/networking/datovka/default.nix => by-name/da/datovka/package.nix} (84%)

diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/by-name/da/datovka/package.nix
similarity index 84%
rename from pkgs/applications/networking/datovka/default.nix
rename to pkgs/by-name/da/datovka/package.nix
index 56f49b92f8dd..7a6abbeb1ccd 100644
--- a/pkgs/applications/networking/datovka/default.nix
+++ b/pkgs/by-name/da/datovka/package.nix
@@ -3,13 +3,9 @@
   stdenv,
   fetchurl,
   pkg-config,
-  wrapQtAppsHook,
   libxml2,
   libdatovka,
-  qmake,
-  qtbase,
-  qtwebsockets,
-  qtsvg,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -23,16 +19,16 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     libdatovka
-    qmake
-    qtbase
-    qtsvg
+    libsForQt5.qmake
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     libxml2
-    qtwebsockets
+    libsForQt5.qtwebsockets
   ];
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b74acf1f8d7..b50e84550196 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1694,8 +1694,6 @@ with pkgs;
 
   datasette = with python3Packages; toPythonApplication datasette;
 
-  datovka = libsForQt5.callPackage ../applications/networking/datovka { };
-
   diagrams-builder = callPackage ../tools/graphics/diagrams-builder {
     inherit (haskellPackages) ghcWithPackages diagrams-builder;
   };

From 9fe62e4b1953ac841f45f7c1cf6195d40c6bd2ac Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 5 Apr 2026 07:41:42 -0500
Subject: [PATCH 2/2] datovka: modernize derivation

---
 pkgs/by-name/da/datovka/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/da/datovka/package.nix b/pkgs/by-name/da/datovka/package.nix
index 7a6abbeb1ccd..1c64adf305ad 100644
--- a/pkgs/by-name/da/datovka/package.nix
+++ b/pkgs/by-name/da/datovka/package.nix
@@ -8,13 +8,13 @@
   libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "datovka";
   version = "4.28.0";
 
   src = fetchurl {
-    url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz";
-    sha256 = "sha256-vTfmJEwbfaPFnZE8o3YnZhjwfMZ0At7eZ0iMoh4/HQE=";
+    url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${finalAttrs.version}/datovka-v${finalAttrs.version}.tar.gz";
+    hash = "sha256-vTfmJEwbfaPFnZE8o3YnZhjwfMZ0At7eZ0iMoh4/HQE=";
   };
 
   nativeBuildInputs = [
@@ -39,4 +39,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     mainProgram = "datovka";
   };
-}
+})