From 34601bfafb979f65ad405ea899f098256a79c356 Mon Sep 17 00:00:00 2001 From: azahi Date: Sun, 6 Apr 2025 13:18:31 +0300 Subject: [PATCH] torrentools: remove package Upstream wasn't updated in a long while and recently got archived. --- pkgs/tools/misc/torrenttools/default.nix | 105 ----------------------- pkgs/tools/misc/torrenttools/fmt-9.patch | 29 ------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 4 files changed, 1 insertion(+), 138 deletions(-) delete mode 100644 pkgs/tools/misc/torrenttools/default.nix delete mode 100644 pkgs/tools/misc/torrenttools/fmt-9.patch diff --git a/pkgs/tools/misc/torrenttools/default.nix b/pkgs/tools/misc/torrenttools/default.nix deleted file mode 100644 index 27e7eae1bd45..000000000000 --- a/pkgs/tools/misc/torrenttools/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - bencode, - catch2, - cli11, - cmake, - ctre, - expected-lite, - fmt, - gsl-lite, - howard-hinnant-date, - yaml-cpp, - ninja, - nlohmann_json, - openssl, - re2, - sigslot, -}: - -stdenv.mkDerivation rec { - pname = "torrenttools"; - version = "0.6.2"; - - srcs = [ - (fetchFromGitHub rec { - owner = "fbdtemme"; - repo = "torrenttools"; - rev = "v${version}"; - hash = "sha256-3rAxw4JM5ruOn0ccKnpdCnUWUPTQOUvRYz8OKU/FpJ8="; - name = repo; - }) - (fetchFromGitHub rec { - owner = "fbdtemme"; - repo = "cliprogress"; - rev = "a887519e360e44c1ef88ea4ef7df652ea049c502"; - hash = "sha256-nVvzez5GB57qSj2SLaxdYlkSX8rRM06H2NnLQGCDWMg="; - name = repo; - }) - (fetchFromGitHub rec { - owner = "fbdtemme"; - repo = "dottorrent"; - rev = "38ac810d6bb3628fd3ce49150c9fb641bb5e78cd"; - hash = "sha256-0H9h0Hud0Fd64lY0pxQ96coDOEDr5wh8v1sNT1lBxb0="; - name = repo; - }) - (fetchFromGitHub rec { - owner = "fbdtemme"; - repo = "termcontrol"; - rev = "c53eec4efe0e163871d9eb54dc074c25cd01abf0"; - hash = "sha256-0j78QtEkhlssVivPl709o5Pf36TzhOZ6VHaqDiH0L0I="; - name = repo; - }) - ]; - sourceRoot = "torrenttools"; - - patches = [ - ./fmt-9.patch - ]; - - postUnpack = '' - cp -pr cliprogress torrenttools/external/cliprogress - cp -pr dottorrent torrenttools/external/dottorrent - cp -pr termcontrol torrenttools/external/termcontrol - chmod -R u+w -- "$sourceRoot" - ''; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - bencode - catch2 - cli11 - ctre - expected-lite - fmt - gsl-lite - howard-hinnant-date - yaml-cpp - nlohmann_json - openssl - re2 - sigslot - ]; - - cmakeFlags = [ - "-DTORRENTTOOLS_BUILD_TESTS:BOOL=ON" - "-DTORRENTTOOLS_TBB:BOOL=OFF" # Our TBB doesn't expose a CMake module. - ]; - - doCheck = true; - - meta = with lib; { - description = "CLI tool for creating, inspecting and modifying BitTorrent metafiles"; - homepage = "https://github.com/fbdtemme/torrenttools"; - license = licenses.mit; - maintainers = with maintainers; [ azahi ]; - platforms = platforms.unix; - mainProgram = "torrenttools"; - }; -} diff --git a/pkgs/tools/misc/torrenttools/fmt-9.patch b/pkgs/tools/misc/torrenttools/fmt-9.patch deleted file mode 100644 index 5bdc666d4bd2..000000000000 --- a/pkgs/tools/misc/torrenttools/fmt-9.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/include/file_matcher.hpp b/include/file_matcher.hpp -index c10c7be405..b67baec0ef 100644 ---- a/include/file_matcher.hpp -+++ b/include/file_matcher.hpp -@@ -47,7 +47,7 @@ - } - - std::string error; -- std::string pattern = ".*.{}$"_format(extension); -+ std::string pattern = fmt::format(".*.{}$", extension); - file_include_list_.Add(pattern, &error); - file_include_list_empty_ = false; - Ensures(error.empty()); -@@ -62,7 +62,7 @@ - } - - std::string error; -- std::string pattern = ".*\\.{}$"_format(extension); -+ std::string pattern = fmt::format(".*\\.{}$", extension); - file_exclude_list_.Add(pattern, &error); - file_exclude_list_empty_ = false; - Ensures(error.empty()); -@@ -243,4 +243,4 @@ - }; - - --} // namespace torrenttools -\ No newline at end of file -+} // namespace torrenttools diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index abceacfc1ba5..dcf72c4d5923 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1706,6 +1706,7 @@ mapAliases { tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28 tomcat_connectors = apacheHttpdPackages.mod_jk; # Added 2024-06-07 tor-browser-bundle-bin = tor-browser; # Added 2023-09-23 + torrenttools = throw "torrenttools has been removed due to lack of maintanance upstream"; # Added 2025-04-06 torq = throw "torq has been removed because the project went closed source"; # Added 2024-11-24 transmission = lib.warnOnInstantiate (transmission3Warning { }) transmission_3; # Added 2024-06-10 transmission-gtk = lib.warnOnInstantiate (transmission3Warning { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36103fab41ce..8cdebd72d311 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16431,10 +16431,6 @@ with pkgs; inherit (linuxPackages) x86_energy_perf_policy; }; - torrenttools = callPackage ../tools/misc/torrenttools { - fmt = fmt_9; - }; - tony = libsForQt5.callPackage ../applications/audio/tony { }; trustedqsl = tqsl; # Alias added 2019-02-10