diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/by-name/al/alkimia/package.nix similarity index 85% rename from pkgs/development/libraries/alkimia/default.nix rename to pkgs/by-name/al/alkimia/package.nix index abcca04ee5ce..6fff009eac5d 100644 --- a/pkgs/development/libraries/alkimia/default.nix +++ b/pkgs/by-name/al/alkimia/package.nix @@ -3,16 +3,10 @@ stdenv, fetchFromGitLab, cmake, - extra-cmake-modules, doxygen, graphviz, - qtbase, - qtwebengine, mpir, - libplasma, - knewstuff, - kpackage, - wrapQtAppsHook, + kdePackages, }: stdenv.mkDerivation (finalAttrs: { @@ -23,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "invent.kde.org"; owner = "office"; repo = "alkimia"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-v5DfnnzOMsoCXr074ydXxBIrSsnbex6G/OqF6psTvPs="; }; @@ -33,16 +27,18 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules doxygen graphviz + ] + ++ (with kdePackages; [ + extra-cmake-modules wrapQtAppsHook - ]; + ]); # qtwebengine is not a mandatory dependency, but it adds some features # we might need for alkimia's dependents. See: # https://github.com/KDE/alkimia/blob/v8.1.2/CMakeLists.txt#L124 - buildInputs = [ + buildInputs = with kdePackages; [ qtbase qtwebengine libplasma @@ -63,6 +59,6 @@ stdenv.mkDerivation (finalAttrs: { application boundaries. ''; license = lib.licenses.lgpl21Plus; - platforms = qtbase.meta.platforms; + platforms = kdePackages.qtbase.meta.platforms; }; }) diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/by-name/km/kmymoney/package.nix similarity index 85% rename from pkgs/applications/office/kmymoney/default.nix rename to pkgs/by-name/km/kmymoney/package.nix index fd5269818a53..035f8bf8431a 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/by-name/km/kmymoney/package.nix @@ -2,34 +2,18 @@ stdenv, lib, fetchurl, - cmake, doxygen, - extra-cmake-modules, graphviz, - kdoctools, pkg-config, - wrapQtAppsHook, autoPatchelfHook, - - akonadi, + kdePackages, alkimia, aqbanking, gmp, gwenhywfar, - karchive, - kcmutils, - kcontacts, - qtwebengine, - kdiagram, - kholidays, - kidentitymanagement, - kitemmodels, libical, libofx, - plasma-activities, - qgpgme, - sqlcipher, # Needed for running tests: @@ -38,12 +22,12 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kmymoney"; version = "5.2.1"; src = fetchurl { - url = "mirror://kde/stable/kmymoney/${version}/${pname}-${version}.tar.xz"; + url = "mirror://kde/stable/kmymoney/${finalAttrs.version}/kmymoney-${finalAttrs.version}.tar.xz"; hash = "sha256-/q30C21MkNd+MnFqhY3SN2kIGGMQTYzqYpELHsPkM2s="; }; @@ -54,21 +38,28 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake doxygen - extra-cmake-modules graphviz - kdoctools pkg-config python3.pkgs.wrapPython + ] + ++ (with kdePackages; [ + extra-cmake-modules wrapQtAppsHook + kdoctools autoPatchelfHook - ]; + ]); buildInputs = [ - akonadi alkimia aqbanking gmp gwenhywfar + libical + libofx + sqlcipher + ] + ++ (with kdePackages; [ + akonadi karchive kcmutils kcontacts @@ -77,12 +68,10 @@ stdenv.mkDerivation rec { kholidays kidentitymanagement kitemmodels - libical - libofx plasma-activities qgpgme - sqlcipher - + ]) + ++ [ # Put it into buildInputs so that CMake can find it, even though we patch # it into the interface later. python3.pkgs.woob @@ -117,4 +106,4 @@ stdenv.mkDerivation rec { das-g ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b7ee0a96cd5..9ff77efcbd15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12065,9 +12065,6 @@ with pkgs; llvmPackages = llvmPackages_18; }; - alkimia = kdePackages.callPackage ../development/libraries/alkimia { }; - kmymoney = kdePackages.callPackage ../applications/office/kmymoney { }; - kotatogram-desktop = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { };