From ce7762236b590b7877c2d070192faca6bc1c4db8 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Fri, 23 May 2025 17:40:09 +0800
Subject: [PATCH 1/2] naev: 0.11.5 -> 0.12.4

---
 pkgs/by-name/na/naev/package.nix | 55 ++++++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/na/naev/package.nix b/pkgs/by-name/na/naev/package.nix
index e94414ba8bc2..655f5b1725b4 100644
--- a/pkgs/by-name/na/naev/package.nix
+++ b/pkgs/by-name/na/naev/package.nix
@@ -1,9 +1,14 @@
 {
   lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchurl,
+  unzip,
+  pkg-config,
+  python3,
   SDL2,
   SDL2_image,
   enet,
-  fetchFromGitHub,
   freetype,
   glpk,
   intltool,
@@ -19,21 +24,39 @@
   openblas,
   pcre2,
   physfs,
-  pkg-config,
-  python3,
-  stdenv,
   suitesparse,
+  libyaml,
+  cmark,
+  dbus,
 }:
 
-stdenv.mkDerivation rec {
+let
+  lyaml = fetchFromGitHub {
+    owner = "gvvaughan";
+    repo = "lyaml";
+    tag = "v6.2.8";
+    hash = "sha256-ADLXi38sAs9ifQ4HJoYzgdp/dw0axGmVCtqJjpqWcmQ=";
+  };
+  nativefiledialog-extended = fetchFromGitHub {
+    owner = "btzy";
+    repo = "nativefiledialog-extended";
+    tag = "v1.2.1";
+    hash = "sha256-GwT42lMZAAKSJpUJE6MYOpSLKUD5o9nSe9lcsoeXgJY=";
+  };
+  nativefiledialog-extended-patch = fetchurl {
+    url = "https://wrapdb.mesonbuild.com/v2/nativefiledialog-extended_1.2.1-1/get_patch";
+    hash = "sha256-BEouiB2HTVWokrYc9VOqdnjRwPBs+us5obQ/NMqXawk=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "naev";
-  version = "0.11.5";
+  version = "0.12.4";
 
   src = fetchFromGitHub {
     owner = "naev";
     repo = "naev";
-    rev = "v${version}";
-    hash = "sha256-vdPkACgLGSTb9E/HZR5KoXn/fro0iHV7hX9kJim1j/M=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-CnpxgHliJK29H4QKDvRp/e0tssTuIZy8hcwQO0tInbg=";
     fetchSubmodules = true;
   };
 
@@ -54,6 +77,9 @@ stdenv.mkDerivation rec {
     pcre2
     physfs
     suitesparse
+    libyaml
+    cmark
+    dbus
   ];
 
   nativeBuildInputs = [
@@ -67,6 +93,7 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
     intltool
+    unzip
   ];
 
   mesonFlags = [
@@ -76,13 +103,21 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    patchShebangs --build dat/outfits/bioship/generate.py utils/build/*.py utils/*.py
+    patchShebangs --build dat/outfits/bioship/generate.py utils/build/*.py utils/*.py dat/naevpedia/ships/ships.py dat/naevpedia/outfits/outfits.py
 
     # Add a missing include to fix the build against luajit-2.1.1741730670.
     # Otherwise the build fails as:
     #   src/lutf8lib.c:421:22: error: 'INT_MAX' undeclared (first use in this function)
     # TODO: drop after 0.12.3 release
     sed -i '1i#include <limits.h>' src/lutf8lib.c
+    cp -r ${lyaml} subprojects/lyaml-6.2.8
+    chmod -R +w subprojects/lyaml-6.2.8
+    cp -r subprojects/packagefiles/lyaml/* subprojects/lyaml-6.2.8
+    cp -r ${nativefiledialog-extended} subprojects/nativefiledialog-extended-1.2.1
+    chmod -R +w subprojects/nativefiledialog-extended-1.2.1
+    tmp=$(mktemp -d)
+    unzip ${nativefiledialog-extended-patch} -d $tmp
+    cp -r $tmp/*/* subprojects/nativefiledialog-extended-1.2.1
   '';
 
   meta = {
@@ -93,4 +128,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ ralismark ];
     platforms = lib.platforms.linux;
   };
-}
+})

From ab80816d9270654c3776100ad8e4df32d1d89474 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 25 May 2025 03:19:38 +0000
Subject: [PATCH 2/2] naev: 0.12.4 -> 0.12.5

Diff: https://github.com/naev/naev/compare/refs/tags/v0.12.4...refs/tags/v0.12.5
---
 pkgs/by-name/na/naev/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/na/naev/package.nix b/pkgs/by-name/na/naev/package.nix
index 655f5b1725b4..970af62c4330 100644
--- a/pkgs/by-name/na/naev/package.nix
+++ b/pkgs/by-name/na/naev/package.nix
@@ -50,13 +50,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "naev";
-  version = "0.12.4";
+  version = "0.12.5";
 
   src = fetchFromGitHub {
     owner = "naev";
     repo = "naev";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CnpxgHliJK29H4QKDvRp/e0tssTuIZy8hcwQO0tInbg=";
+    hash = "sha256-I+OU3sr+C8HPnJTQ+Cc/EvshzawqikoMg3cp9uQ5dSQ=";
     fetchSubmodules = true;
   };