From 5601b10229abb8717e656600778e48c0600bf6be Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 25 Jul 2025 22:11:50 +0400 Subject: [PATCH] tg: migrate to by-name --- .../tg/default.nix => by-name/tg/tg/package.nix} | 14 +++++--------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 11 deletions(-) rename pkgs/{applications/networking/instant-messengers/telegram/tg/default.nix => by-name/tg/tg/package.nix} (82%) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix b/pkgs/by-name/tg/tg/package.nix similarity index 82% rename from pkgs/applications/networking/instant-messengers/telegram/tg/default.nix rename to pkgs/by-name/tg/tg/package.nix index a12db6326f4e..ad714cd23cd1 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix +++ b/pkgs/by-name/tg/tg/package.nix @@ -1,20 +1,16 @@ { lib, - buildPythonApplication, fetchFromGitHub, - poetry-core, - pythonOlder, + python3Packages, stdenv, libnotify, - mailcap-fix, - python-telegram, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "tg"; version = "0.22.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = python3Packages.pythonOlder "3.9"; src = fetchFromGitHub { owner = "paul-nameless"; @@ -32,9 +28,9 @@ buildPythonApplication rec { sed -i 's|^NOTIFY_CMD = .*|NOTIFY_CMD = "${libnotify}/bin/notify-send {title} {message} -i {icon_path}"|' tg/config.py ''; - build-system = [ poetry-core ]; + build-system = [ python3Packages.poetry-core ]; - dependencies = [ + dependencies = with python3Packages; [ mailcap-fix python-telegram ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f3f58c27b75..b0fa514a1450 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13861,8 +13861,6 @@ with pkgs; stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv else stdenv; }; - tg = python3Packages.callPackage ../applications/networking/instant-messengers/telegram/tg { }; - termdown = python3Packages.callPackage ../applications/misc/termdown { }; terminaltexteffects = with python3Packages; toPythonApplication terminaltexteffects;