From 234c754c6cba511946736be958dfae472d3d8ea5 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue, 25 Feb 2025 15:08:01 +0100
Subject: [PATCH 1/5] ddnet: 18.9 -> 19.0

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/games/ddnet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix
index 5967d6098852..106284474d04 100644
--- a/pkgs/games/ddnet/default.nix
+++ b/pkgs/games/ddnet/default.nix
@@ -32,13 +32,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ddnet";
-  version = "18.9";
+  version = "19.0";
 
   src = fetchFromGitHub {
     owner = "ddnet";
     repo = pname;
     rev = version;
-    hash = "sha256-aJzNfo7K5OOo14XJRmDOYzXFF5fZK0aXgIfVvjvzjrU=";
+    hash = "sha256-R9LXcYM96fibHzpXDWIOSASKIbh+GeiGyz7xVvV2v1Q=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From 8c8fa169510b13cde0f589d65f973afa68937810 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue, 25 Feb 2025 15:08:35 +0100
Subject: [PATCH 2/5] ddnet: add Scrumplex to maintainers

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/games/ddnet/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix
index 106284474d04..444991064d42 100644
--- a/pkgs/games/ddnet/default.nix
+++ b/pkgs/games/ddnet/default.nix
@@ -128,9 +128,10 @@ stdenv.mkDerivation rec {
     homepage = "https://ddnet.org";
     license = licenses.asl20;
     maintainers = with maintainers; [
-      sirseruju
       lom
       ncfavier
+      Scrumplex
+      sirseruju
     ];
     mainProgram = "DDNet";
   };

From 65bcebfa19ab37438768f99a111c15c4cda7dbab Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue, 25 Feb 2025 15:12:18 +0100
Subject: [PATCH 3/5] ddnet: move to by-name

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/{games/ddnet/default.nix => by-name/dd/ddnet/package.nix} | 0
 pkgs/top-level/all-packages.nix                                | 1 -
 2 files changed, 1 deletion(-)
 rename pkgs/{games/ddnet/default.nix => by-name/dd/ddnet/package.nix} (100%)

diff --git a/pkgs/games/ddnet/default.nix b/pkgs/by-name/dd/ddnet/package.nix
similarity index 100%
rename from pkgs/games/ddnet/default.nix
rename to pkgs/by-name/dd/ddnet/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ed02af407e1..f6a71349973f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16106,7 +16106,6 @@ with pkgs;
   deliantra-maps = callPackage ../games/deliantra/maps.nix { };
   deliantra-data = callPackage ../games/deliantra/data.nix { };
 
-  ddnet = callPackage ../games/ddnet {};
   ddnet-server = ddnet.override { buildClient = false; };
 
   devilutionx = callPackage ../games/devilutionx {

From eeb1ab1688cc4dc05ffa122d6044745002385e2d Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed, 26 Feb 2025 09:12:16 +0100
Subject: [PATCH 4/5] ddnet: modernize src

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/dd/ddnet/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix
index 444991064d42..d4db65ba9c74 100644
--- a/pkgs/by-name/dd/ddnet/package.nix
+++ b/pkgs/by-name/dd/ddnet/package.nix
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "ddnet";
-    repo = pname;
-    rev = version;
+    repo = "ddnet";
+    tag = version;
     hash = "sha256-R9LXcYM96fibHzpXDWIOSASKIbh+GeiGyz7xVvV2v1Q=";
   };
 

From 8a031ae182bd3a8b321140e5e5252769fd85b8ef Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed, 26 Feb 2025 09:14:54 +0100
Subject: [PATCH 5/5] ddnet: fix licenses

See https://github.com/ddnet/ddnet/blob/33ae91335044b95bf28d9b753e6c8a20baa04eeb/license.txt

Upstream code is licensed under zlib, some assets are CC-BY-SA-3.0 and
fonts are OFL-1.1

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/dd/ddnet/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix
index d4db65ba9c74..4753f06e7894 100644
--- a/pkgs/by-name/dd/ddnet/package.nix
+++ b/pkgs/by-name/dd/ddnet/package.nix
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
     install_name_tool -change "$out/lib/libsteam_api.dylib" "$out/lib/ddnet/libsteam_api.dylib" "$out/bin/DDNet"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Teeworlds modification with a unique cooperative gameplay";
     longDescription = ''
       DDraceNetwork (DDNet) is an actively maintained version of DDRace,
@@ -126,8 +126,12 @@ stdenv.mkDerivation rec {
       design your own maps, or run your own server.
     '';
     homepage = "https://ddnet.org";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = with lib.licenses; [
+      zlib
+      ofl
+      cc-by-sa-30
+    ];
+    maintainers = with lib.maintainers; [
       lom
       ncfavier
       Scrumplex