From f2095203e66f1cf4d2fefcac4281ff9da5315a89 Mon Sep 17 00:00:00 2001 From: Heinz Deinhart Date: Sun, 6 Oct 2024 20:23:15 +0200 Subject: [PATCH 1/2] ddnet: 18.4 -> 18.6 https://ddnet.org/downloads/#18.6 https://github.com/ddnet/ddnet/compare/18.4...18.6 --- pkgs/games/ddnet/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 7356e9395d766..f899cdf8ddc15 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -36,19 +36,19 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "18.4"; + version = "18.6"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-BoEFh0lCd2pCIod5sFafnOs/TQHj/SlIAU8P4o+cjyE="; + hash = "sha256-thAB7QtR23j39ORK1YT2Idp4J7GffbNV7snbLAnYzMI="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-1MJ5cP4lyRSZ7VRED8RL5scnqpcy8/avmBKW1Zmt6FU="; + hash = "sha256-/kCsAZP9cwUQFcNnk5/eYMzw80Bh4JnwPXd299p1JEU="; }; nativeBuildInputs = [ @@ -92,12 +92,12 @@ stdenv.mkDerivation rec { Security ]); - patches = [ - (fetchpatch { - url = "https://github.com/ddnet/ddnet/pull/8517/commits/c840bf45016a30e629f7684df5fab5d07b2c70d5.patch"; - hash = "sha256-UG7pi0Xh/nAHFEF1RIyNZLewF+NFilTLARbV5oUlftc="; - }) - ]; +# patches = [ +# (fetchpatch { +# url = "https://github.com/ddnet/ddnet/pull/8517/commits/c840bf45016a30e629f7684df5fab5d07b2c70d5.patch"; +# hash = "sha256-UG7pi0Xh/nAHFEF1RIyNZLewF+NFilTLARbV5oUlftc="; +# }) +# ]; postPatch = '' substituteInPlace src/engine/shared/storage.cpp \ From 93b0eb60e053bffce2985f2aabe3348e5085c1b1 Mon Sep 17 00:00:00 2001 From: Heinz Deinhart Date: Tue, 22 Oct 2024 10:00:43 +0200 Subject: [PATCH 2/2] ddnet: 18.4 -> 18.6 (remove commented out patch) --- pkgs/games/ddnet/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index f899cdf8ddc15..78583f1330641 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -92,13 +92,6 @@ stdenv.mkDerivation rec { Security ]); -# patches = [ -# (fetchpatch { -# url = "https://github.com/ddnet/ddnet/pull/8517/commits/c840bf45016a30e629f7684df5fab5d07b2c70d5.patch"; -# hash = "sha256-UG7pi0Xh/nAHFEF1RIyNZLewF+NFilTLARbV5oUlftc="; -# }) -# ]; - postPatch = '' substituteInPlace src/engine/shared/storage.cpp \ --replace /usr/ $out/