From cb48e9f7aa968e3bcfdb49610be9aaf99aea0111 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Fri, 6 Feb 2026 08:41:24 -0600 Subject: [PATCH] tellico: migrate to by-name, modernize derivation --- .../te/tellico/package.nix} | 49 +++++++------------ pkgs/top-level/all-packages.nix | 2 - 2 files changed, 18 insertions(+), 33 deletions(-) rename pkgs/{applications/misc/tellico/default.nix => by-name/te/tellico/package.nix} (62%) diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/by-name/te/tellico/package.nix similarity index 62% rename from pkgs/applications/misc/tellico/default.nix rename to pkgs/by-name/te/tellico/package.nix index 253493ca99ec..8e8c05991055 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/by-name/te/tellico/package.nix @@ -4,26 +4,13 @@ fetchFromGitLab, cmake, exempi, - extra-cmake-modules, - karchive, - kdoctools, - kfilemetadata, - kitemmodels, - knewstuff, - kxmlgui, libcdio, - libkcddb, - libksane, makeWrapper, - poppler, - qtcharts, - qtwebengine, - solid, taglib, - wrapQtAppsHook, + kdePackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tellico"; version = "4.1.4"; @@ -31,32 +18,32 @@ stdenv.mkDerivation rec { domain = "invent.kde.org"; owner = "office"; repo = "tellico"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-eScAOd1da05fqXtbcz8oEJiObB7CUxiYReSrr3R7ybM="; }; nativeBuildInputs = [ cmake - extra-cmake-modules - kdoctools + kdePackages.extra-cmake-modules + kdePackages.kdoctools makeWrapper - wrapQtAppsHook + kdePackages.wrapQtAppsHook ]; buildInputs = [ exempi - karchive - kfilemetadata - kitemmodels - knewstuff - kxmlgui + kdePackages.karchive + kdePackages.kfilemetadata + kdePackages.kitemmodels + kdePackages.knewstuff + kdePackages.kxmlgui libcdio - libkcddb - libksane - poppler - qtcharts - qtwebengine - solid + kdePackages.libkcddb + kdePackages.libksane + kdePackages.poppler + kdePackages.qtcharts + kdePackages.qtwebengine + kdePackages.solid taglib ]; @@ -72,4 +59,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ numkem ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index def965477c65..77e494af4b89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12788,8 +12788,6 @@ with pkgs; hasktags = haskellPackages.hasktags; }; - tellico = kdePackages.callPackage ../applications/misc/tellico { }; - termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py { }; inherit (callPackage ../applications/networking/cluster/terraform { })