From 29a46e30da6130ad620517dc55bc3319a71e5848 Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Tue, 15 Apr 2025 11:58:03 +0200
Subject: [PATCH 1/4] colobot-data: modernize

---
 pkgs/by-name/co/colobot/data.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/co/colobot/data.nix b/pkgs/by-name/co/colobot/data.nix
index d2fcedee561d..cf538fcda729 100644
--- a/pkgs/by-name/co/colobot/data.nix
+++ b/pkgs/by-name/co/colobot/data.nix
@@ -10,15 +10,15 @@
   python3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "colobot-data";
   version = "0.2.0-alpha";
 
   src = fetchFromGitHub {
     owner = "colobot";
     repo = "colobot-data";
-    rev = "colobot-gold-${version}";
-    sha256 = "sha256-yzIbAzrGsDe6hO0GHF9gjnj7IE8B7+5LDbvjZi4Wtms=";
+    tag = "colobot-gold-${finalAttrs.version}";
+    hash = "sha256-yzIbAzrGsDe6hO0GHF9gjnj7IE8B7+5LDbvjZi4Wtms=";
   };
 
   nativeBuildInputs = [
@@ -45,11 +45,11 @@ stdenv.mkDerivation rec {
     cd localSrc
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://colobot.info/";
     description = "Game data for colobot";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ freezeboy ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ freezeboy ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From 797bb84c85a14ed6fd9113b4ab2ce4665c6f945c Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Tue, 15 Apr 2025 11:58:16 +0200
Subject: [PATCH 2/4] colobot-data: 0.2.0-alpha -> 0.2.2-alpha

---
 pkgs/by-name/co/colobot/data.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/colobot/data.nix b/pkgs/by-name/co/colobot/data.nix
index cf538fcda729..5d0ccf49d219 100644
--- a/pkgs/by-name/co/colobot/data.nix
+++ b/pkgs/by-name/co/colobot/data.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "colobot-data";
-  version = "0.2.0-alpha";
+  version = "0.2.2-alpha";
 
   src = fetchFromGitHub {
     owner = "colobot";
     repo = "colobot-data";
     tag = "colobot-gold-${finalAttrs.version}";
-    hash = "sha256-yzIbAzrGsDe6hO0GHF9gjnj7IE8B7+5LDbvjZi4Wtms=";
+    hash = "sha256-Voxfc5iCFT7gyahaai5wLPi6fe7dWryYLjfNjfXpwWs=";
   };
 
   nativeBuildInputs = [
@@ -30,7 +30,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [ gettext ];
 
-  enableParallelBuilding = false;
   # Build procedure requires the data folder
   patchPhase = ''
     cp -r $src localSrc

From 157d101f87321e3742ff2f0f2f6098bbf7980a35 Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Tue, 15 Apr 2025 11:59:02 +0200
Subject: [PATCH 3/4] colobot: modernize

---
 pkgs/by-name/co/colobot/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/co/colobot/package.nix b/pkgs/by-name/co/colobot/package.nix
index 89ed5a7bd7e8..a687dfb06b16 100644
--- a/pkgs/by-name/co/colobot/package.nix
+++ b/pkgs/by-name/co/colobot/package.nix
@@ -24,7 +24,7 @@
 let
   colobot-data = callPackage ./data.nix { };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "colobot";
   # Maybe require an update to package colobot-data as well
   # in file data.nix next to this one
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "colobot";
     repo = "colobot";
-    rev = "colobot-gold-${version}";
+    tag = "colobot-gold-${finalAttrs.version}";
     hash = "sha256-3iea2+5xCT0//NAjMHrynZKSoiOSgLTNMUQkRhXuXg8=";
   };
 
@@ -68,11 +68,11 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://colobot.info/";
     description = "Colobot: Gold Edition is a real-time strategy game, where you can program your bots";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ freezeboy ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ freezeboy ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From 351bf0e86cbdeb99eeab7803e0c1dd4a082bf269 Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Tue, 15 Apr 2025 11:59:15 +0200
Subject: [PATCH 4/4] colobot: 0.2.1-alpha -> 0.2.2-alpha

---
 pkgs/by-name/co/colobot/package.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/co/colobot/package.nix b/pkgs/by-name/co/colobot/package.nix
index a687dfb06b16..e720c73fe40d 100644
--- a/pkgs/by-name/co/colobot/package.nix
+++ b/pkgs/by-name/co/colobot/package.nix
@@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "colobot";
   # Maybe require an update to package colobot-data as well
   # in file data.nix next to this one
-  version = "0.2.1-alpha";
+  version = "0.2.2-alpha";
 
   src = fetchFromGitHub {
     owner = "colobot";
     repo = "colobot";
     tag = "colobot-gold-${finalAttrs.version}";
-    hash = "sha256-3iea2+5xCT0//NAjMHrynZKSoiOSgLTNMUQkRhXuXg8=";
+    hash = "sha256-QhNHtAG+hKq7qJhKWCJcP4ejm5YDOU8pyYtitJppVlU=";
   };
 
   nativeBuildInputs = [
@@ -58,8 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
     openal
   ];
 
-  enableParallelBuilding = false;
-
   # The binary ends in games directory
   postInstall = ''
     mv $out/games $out/bin