From 8db91291321b3dfe3987fa871955de042e2810e8 Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Sun, 27 Apr 2025 17:35:06 +0200 Subject: [PATCH] twitch-tui: adopt, move to by-name, modernize The current maintainer no longer wishes to maintain the package. See the discussion in #398440. This also moves the package to pkgs/by-name. --- .../tw/twitch-tui/package.nix} | 32 +++++++------------ pkgs/top-level/all-packages.nix | 4 --- 2 files changed, 11 insertions(+), 25 deletions(-) rename pkgs/{applications/networking/instant-messengers/twitch-tui/default.nix => by-name/tw/twitch-tui/package.nix} (58%) diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/by-name/tw/twitch-tui/package.nix similarity index 58% rename from pkgs/applications/networking/instant-messengers/twitch-tui/default.nix rename to pkgs/by-name/tw/twitch-tui/package.nix index 7e7438e873ee..1d7f03d60ecc 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/by-name/tw/twitch-tui/package.nix @@ -1,23 +1,19 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, - CoreServices, - Security, - SystemConfiguration, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "twitch-tui"; version = "2.6.19"; src = fetchFromGitHub { owner = "Xithrius"; - repo = pname; - tag = "v${version}"; + repo = "twitch-tui"; + tag = "v${finalAttrs.version}"; hash = "sha256-hA66YcxbQem9ymOu3tGA4biKUCoJ2jKnUSK+9+0P2Eg="; }; @@ -28,22 +24,16 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - SystemConfiguration - ]; + buildInputs = [ + openssl + ]; - meta = with lib; { + meta = { description = "Twitch chat in the terminal"; homepage = "https://github.com/Xithrius/twitch-tui"; - changelog = "https://github.com/Xithrius/twitch-tui/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ maintainers.taha ]; + changelog = "https://github.com/Xithrius/twitch-tui/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.lordmzte ]; mainProgram = "twt"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 038c4fa1352b..f9beb6c3c72e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2924,10 +2924,6 @@ with pkgs; persistent-evdev = python3Packages.callPackage ../servers/persistent-evdev { }; - twitch-tui = callPackage ../applications/networking/instant-messengers/twitch-tui { - inherit (darwin.apple_sdk_11_0.frameworks) Security CoreServices SystemConfiguration; - }; - inherit (import ../development/libraries/libsbsms pkgs) libsbsms libsbsms_2_0_2