diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/by-name/da/datovka/package.nix similarity index 60% rename from pkgs/applications/networking/datovka/default.nix rename to pkgs/by-name/da/datovka/package.nix index 56f49b92f8dd..1c64adf305ad 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/by-name/da/datovka/package.nix @@ -3,36 +3,32 @@ stdenv, fetchurl, pkg-config, - wrapQtAppsHook, libxml2, libdatovka, - qmake, - qtbase, - qtwebsockets, - qtsvg, + 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 = [ pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ libdatovka - qmake - qtbase - qtsvg + libsForQt5.qmake + libsForQt5.qtbase + libsForQt5.qtsvg libxml2 - qtwebsockets + libsForQt5.qtwebsockets ]; meta = { @@ -43,4 +39,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "datovka"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7253d25f4f8..25158769921a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1690,8 +1690,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; };