From c19173b97d7a0ee22bf59f39c3453a599dc48e8f Mon Sep 17 00:00:00 2001 From: nartsisss Date: Tue, 29 Oct 2024 15:29:57 +0300 Subject: [PATCH 1/3] telegram-bot-api: 7.3 -> 7.10 --- pkgs/servers/telegram-bot-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/telegram-bot-api/default.nix b/pkgs/servers/telegram-bot-api/default.nix index 3481b853715d..dce7eea0ccd6 100644 --- a/pkgs/servers/telegram-bot-api/default.nix +++ b/pkgs/servers/telegram-bot-api/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "telegram-bot-api"; - version = "7.3"; + version = "7.10"; src = fetchFromGitHub { repo = "telegram-bot-api"; owner = "tdlib"; - rev = "5951bfbab8b1274437c613c1c48d91be2a050371"; - hash = "sha256-5aNZqP4K+zP7q1+yllr6fysEcewhh/V9Vl6GXQolanI="; + rev = "a186a9ae823d91678ace87ef5b920688c555f5b5"; + hash = "sha256-1oGDR9WLWC/0QyAmTkMWkbkD+49/gU/nWBZq0mMOl8g="; fetchSubmodules = true; }; From 2e74199368188f308c134c0a9e1da89ee521d488 Mon Sep 17 00:00:00 2001 From: nartsisss Date: Tue, 29 Oct 2024 15:33:03 +0300 Subject: [PATCH 2/3] telegram-bot-api: move to pkgs/by-name --- .../default.nix => by-name/te/telegram-bot-api/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/telegram-bot-api/default.nix => by-name/te/telegram-bot-api/package.nix} (100%) diff --git a/pkgs/servers/telegram-bot-api/default.nix b/pkgs/by-name/te/telegram-bot-api/package.nix similarity index 100% rename from pkgs/servers/telegram-bot-api/default.nix rename to pkgs/by-name/te/telegram-bot-api/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78432a806ea6..e13f4de011a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32592,8 +32592,6 @@ with pkgs; else stdenv; }; - telegram-bot-api = callPackage ../servers/telegram-bot-api { }; - tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { }; tg = python3Packages.callPackage ../applications/networking/instant-messengers/telegram/tg { }; From bc50b936690caaac727f611adf7f429cdf8a0cbe Mon Sep 17 00:00:00 2001 From: nartsisss Date: Tue, 29 Oct 2024 15:35:57 +0300 Subject: [PATCH 3/3] telegram-bot-api: refactor meta, format using nixfmt-rfc-style --- pkgs/by-name/te/telegram-bot-api/package.nix | 31 +++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/te/telegram-bot-api/package.nix b/pkgs/by-name/te/telegram-bot-api/package.nix index dce7eea0ccd6..97e96a199911 100644 --- a/pkgs/by-name/te/telegram-bot-api/package.nix +++ b/pkgs/by-name/te/telegram-bot-api/package.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gperf, openssl, zlib }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gperf, + openssl, + zlib, +}: stdenv.mkDerivation { pname = "telegram-bot-api"; @@ -12,15 +20,24 @@ stdenv.mkDerivation { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake gperf ]; - buildInputs = [ openssl zlib ]; + nativeBuildInputs = [ + cmake + gperf + ]; + buildInputs = [ + openssl + zlib + ]; - meta = with lib; { + meta = { description = "Telegram Bot API server"; homepage = "https://github.com/tdlib/telegram-bot-api"; - license = licenses.boost; - maintainers = with maintainers; [ Anillc Forden ]; - platforms = platforms.all; + license = lib.licenses.boost; + maintainers = with lib.maintainers; [ + Anillc + Forden + ]; + platforms = lib.platforms.all; mainProgram = "telegram-bot-api"; }; }