From f6ae97b37c762646078b0d811b6578c2ffce889e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 Mar 2024 23:34:56 +0000
Subject: unciv: 4.10.15 -> 4.10.19

---
 pkgs/games/unciv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix
index 703ee9b18b9f..b017677e8b59 100644
--- a/pkgs/games/unciv/default.nix
+++ b/pkgs/games/unciv/default.nix
@@ -27,11 +27,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "unciv";
-  version = "4.10.15";
+  version = "4.10.19";
 
   src = fetchurl {
     url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
-    hash = "sha256-SikrApaaGCAQc6ncqI4vRfXSgG/hgfO1wn5B5fj+W6Y=";
+    hash = "sha256-f9fg2Clz9CjoC8xzCguJ2A3Aczom+KjEyIlMJC2oS/o=";
   };
 
   dontUnpack = true;
-- 
cgit v1.2.3


From 60452dc8715005ece22916d73c346247f35b9be3 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 17 Mar 2024 01:32:23 +0100
Subject: unciv: move to pkgs/by-name

---
 pkgs/by-name/un/unciv/package.nix | 62 +++++++++++++++++++++++++++++++++++++++
 pkgs/games/unciv/default.nix      | 62 ---------------------------------------
 pkgs/top-level/all-packages.nix   |  2 --
 3 files changed, 62 insertions(+), 64 deletions(-)
 create mode 100644 pkgs/by-name/un/unciv/package.nix
 delete mode 100644 pkgs/games/unciv/default.nix

(limited to 'pkgs')

diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix
new file mode 100644
index 000000000000..b017677e8b59
--- /dev/null
+++ b/pkgs/by-name/un/unciv/package.nix
@@ -0,0 +1,62 @@
+{ stdenv
+, lib
+, fetchurl
+, copyDesktopItems
+, makeDesktopItem
+, makeWrapper
+, jre
+, libGL
+, libpulseaudio
+, libXxf86vm
+}:
+let
+  desktopItem = makeDesktopItem {
+    name = "unciv";
+    exec = "unciv";
+    comment = "An open-source Android/Desktop remake of Civ V";
+    desktopName = "Unciv";
+    categories = [ "Game" ];
+  };
+
+  envLibPath = lib.makeLibraryPath (lib.optionals stdenv.isLinux [
+    libGL
+    libpulseaudio
+    libXxf86vm
+  ]);
+
+in
+stdenv.mkDerivation rec {
+  pname = "unciv";
+  version = "4.10.19";
+
+  src = fetchurl {
+    url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
+    hash = "sha256-f9fg2Clz9CjoC8xzCguJ2A3Aczom+KjEyIlMJC2oS/o=";
+  };
+
+  dontUnpack = true;
+
+  nativeBuildInputs = [ copyDesktopItems makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    makeWrapper ${jre}/bin/java $out/bin/unciv \
+      --prefix LD_LIBRARY_PATH : "${envLibPath}" \
+      --prefix PATH : ${lib.makeBinPath [ jre ]} \
+      --add-flags "-jar ${src}"
+
+    runHook postInstall
+  '';
+
+  desktopItems = [ desktopItem ];
+
+  meta = with lib; {
+    description = "An open-source Android/Desktop remake of Civ V";
+    homepage = "https://github.com/yairm210/Unciv";
+    maintainers = with maintainers; [ tex ];
+    sourceProvenance = with sourceTypes; [ binaryBytecode ];
+    license = licenses.mpl20;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix
deleted file mode 100644
index b017677e8b59..000000000000
--- a/pkgs/games/unciv/default.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, copyDesktopItems
-, makeDesktopItem
-, makeWrapper
-, jre
-, libGL
-, libpulseaudio
-, libXxf86vm
-}:
-let
-  desktopItem = makeDesktopItem {
-    name = "unciv";
-    exec = "unciv";
-    comment = "An open-source Android/Desktop remake of Civ V";
-    desktopName = "Unciv";
-    categories = [ "Game" ];
-  };
-
-  envLibPath = lib.makeLibraryPath (lib.optionals stdenv.isLinux [
-    libGL
-    libpulseaudio
-    libXxf86vm
-  ]);
-
-in
-stdenv.mkDerivation rec {
-  pname = "unciv";
-  version = "4.10.19";
-
-  src = fetchurl {
-    url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
-    hash = "sha256-f9fg2Clz9CjoC8xzCguJ2A3Aczom+KjEyIlMJC2oS/o=";
-  };
-
-  dontUnpack = true;
-
-  nativeBuildInputs = [ copyDesktopItems makeWrapper ];
-
-  installPhase = ''
-    runHook preInstall
-
-    makeWrapper ${jre}/bin/java $out/bin/unciv \
-      --prefix LD_LIBRARY_PATH : "${envLibPath}" \
-      --prefix PATH : ${lib.makeBinPath [ jre ]} \
-      --add-flags "-jar ${src}"
-
-    runHook postInstall
-  '';
-
-  desktopItems = [ desktopItem ];
-
-  meta = with lib; {
-    description = "An open-source Android/Desktop remake of Civ V";
-    homepage = "https://github.com/yairm210/Unciv";
-    maintainers = with maintainers; [ tex ];
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.mpl20;
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d03765c9b5c..a7a8abe2b2ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -38027,8 +38027,6 @@ with pkgs;
 
   umoria = callPackage ../games/umoria { };
 
-  unciv = callPackage ../games/unciv { };
-
   unnethack = callPackage ../games/unnethack { };
 
   uqm = callPackage ../games/uqm { };
-- 
cgit v1.2.3