From db83dc6a157510faa6442e5425d0718d208a8dc2 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 26 Apr 2026 15:52:00 +0300 Subject: [PATCH] tora: drop --- pkgs/development/tools/tora/default.nix | 99 ------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 101 deletions(-) delete mode 100644 pkgs/development/tools/tora/default.nix diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix deleted file mode 100644 index ce8fc1d8ea23..000000000000 --- a/pkgs/development/tools/tora/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - extra-cmake-modules, - makeWrapper, - qttools, - wrapQtAppsHook, - boost, - doxygen, - openssl, - libmysqlclient, - postgresql, - graphviz, - loki, - qscintilla, - qtbase, -}: - -stdenv.mkDerivation { - pname = "tora"; - version = "3.2.176"; - - src = fetchFromGitHub { - owner = "tora-tool"; - repo = "tora"; - rev = "39bf2837779bf458fc72a9f0e49271152e57829f"; - sha256 = "0fr9b542i8r6shgnz33lc3cz333fnxgmac033yxfrdjfglzk0j2k"; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - makeWrapper - qttools - wrapQtAppsHook - ]; - - buildInputs = [ - boost - doxygen - graphviz - loki - libmysqlclient - openssl - postgresql # needs libecpg, which is not available in libpq package - qscintilla - qtbase - ]; - - preConfigure = '' - substituteInPlace src/widgets/toglobalsetting.cpp \ - --replace 'defaultGvHome = "/usr/bin"' 'defaultGvHome = "${lib.getBin graphviz}/bin"' - substituteInPlace extlibs/libermodel/dotgraph.cpp \ - --replace /usr/bin/dot ${lib.getBin graphviz}/bin/dot - ''; - - cmakeFlags = [ - "-DWANT_INTERNAL_LOKI=0" - "-DWANT_INTERNAL_QSCINTILLA=0" - # cmake/modules/FindQScintilla.cmake looks in qtbase and for the wrong library name - "-DQSCINTILLA_INCLUDE_DIR=${qscintilla}/include" - "-DQSCINTILLA_LIBRARY=${qscintilla}/lib/libqscintilla2.so" - "-DENABLE_DB2=0" - "-DENABLE_ORACLE=0" - "-DENABLE_TERADATA=0" - "-DQT5_BUILD=1" - "-Wno-dev" - ]; - - # these libraries are only searched for at runtime so we need to force-link them - env.NIX_LDFLAGS = toString [ - "-lgvc" - "-lmysqlclient" - "-lecpg" - "-lssl" - "-L${libmysqlclient}/lib/mariadb" - ]; - - qtWrapperArgs = [ - "--prefix PATH : ${lib.getBin graphviz}/bin" - ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" - ''; - - meta = { - description = "Tora SQL tool"; - mainProgram = "tora"; - maintainers = with lib.maintainers; [ peterhoeg ]; - platforms = lib.platforms.linux; - license = lib.licenses.asl20; - # fails to build on hydra since 2024 - broken = true; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 73e248dfe62c..d086129240db 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2072,6 +2072,7 @@ mapAliases { tomcat_connectors = throw "'tomcat_connectors' has been renamed to/replaced by 'apacheHttpdPackages.mod_jk'"; # Converted to throw 2025-10-27 tooling-language-server = deputy; # Added 2025-06-22 tor-browser-bundle-bin = throw "'tor-browser-bundle-bin' has been renamed to/replaced by 'tor-browser'"; # Converted to throw 2025-10-27 + tora = throw "'tora' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01 tracker = throw "'tracker' has been renamed to/replaced by 'tinysparql'"; # Converted to throw 2025-10-27 tracker-miners = throw "'tracker-miners' has been renamed to/replaced by 'localsearch'"; # Converted to throw 2025-10-27 transfig = throw "'transfig' has been renamed to/replaced by 'fig2dev'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55e2cb7319de..a8bc68cf7b61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12064,8 +12064,6 @@ with pkgs; discord-development ; - tora = libsForQt5.callPackage ../development/tools/tora { }; - torcs-without-data = callPackage ../../pkgs/by-name/to/torcs/without-data.nix { }; nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { };