From 7aa3d675200b7eb3914ae39ec19ccf4340f67134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Bori?= Date: Mon, 23 Jun 2025 17:54:51 +0200 Subject: [PATCH] taterclient-ddnet: 10.3.0 -> 10.4.0 --- .../client_log_format_security.patch | 13 ------------- pkgs/by-name/ta/taterclient-ddnet/package.nix | 10 +++------- 2 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 pkgs/by-name/ta/taterclient-ddnet/client_log_format_security.patch diff --git a/pkgs/by-name/ta/taterclient-ddnet/client_log_format_security.patch b/pkgs/by-name/ta/taterclient-ddnet/client_log_format_security.patch deleted file mode 100644 index 9d0c56170162..000000000000 --- a/pkgs/by-name/ta/taterclient-ddnet/client_log_format_security.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/engine/client/client.cpp.orig b/src/engine/client/client.cpp -index ab70b3c..9e25353 100644 ---- a/src/engine/client/client.cpp.orig -+++ b/src/engine/client/client.cpp -@@ -4933,7 +4933,7 @@ int main(int argc, const char **argv) - { - char aError[2048]; - snprintf(aError, sizeof(aError), "Failed to load config from '%s'.", s_aConfigDomains[ConfigDomain].m_aConfigPath); -- log_error("client", aError); -+ log_error("client", "%s", aError); - pClient->ShowMessageBox("Config File Error", aError); - PerformAllCleanup(); - return -1; diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix index 76a01e1b4b62..10ef97b24d46 100644 --- a/pkgs/by-name/ta/taterclient-ddnet/package.nix +++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "taterclient-ddnet"; - version = "10.3.0"; + version = "10.4.0"; src = fetchFromGitHub { owner = "sjrc6"; repo = "taterclient-ddnet"; tag = "V${finalAttrs.version}"; - hash = "sha256-OEoiUtD87xsXBgAZ65mmfmAJcEvrley3drRX+IJo20s="; + hash = "sha256-SSf9W+1yl7ExHsifbVM5IN4OfZvMdz62xMfdb++38II="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -80,10 +80,6 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - patches = [ - ./client_log_format_security.patch - ]; - postPatch = '' substituteInPlace src/engine/shared/storage.cpp \ --replace-fail /usr/ $out/ @@ -101,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { # Since we are not building the server executable, the `run_tests` Makefile target # will not be generated. # - # See https://github.com/sjrc6/TaterClient-ddnet/blob/V10.3.0/CMakeLists.txt#L3072 + # See https://github.com/sjrc6/TaterClient-ddnet/blob/V10.4.0/CMakeLists.txt#L3088 doCheck = false; preFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''