From 02446bf7ef0119bb9a93d9549338c147343c862c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 28 Nov 2025 00:56:32 +0000
Subject: [PATCH] woeusb-ng: migrate to pyproject and modernize packaging
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Switch to pyproject-based build (`pyproject = true`) and use
`python3Packages.buildPythonApplication` directly instead of a top-level
`with python3Packages`. Add `build-system = [ python3Packages.setuptools ]`
and update `rev` → `tag` for the GitHub source.

Rename `propagatedBuildInputs` → `dependencies` and qualify Python
dependencies with `python3Packages.`. Normalize the `maintainers` entry to
a list. These are packaging and style modernizations; no upstream version
or source content changes.

woeusbgui: move p7zip, parted, grub to buildInputs

woeusbgui: add to wrapper PATH

woeusb-ng: remove buildInputs
---
 pkgs/by-name/wo/woeusb-ng/package.nix | 34 ++++++++++++++++-----------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/wo/woeusb-ng/package.nix b/pkgs/by-name/wo/woeusb-ng/package.nix
index d36b80885674..7ea83e3ec290 100644
--- a/pkgs/by-name/wo/woeusb-ng/package.nix
+++ b/pkgs/by-name/wo/woeusb-ng/package.nix
@@ -8,20 +8,20 @@
   grub2,
 }:
 
-with python3Packages;
-
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "woeusb-ng";
   version = "0.2.12";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "WoeUSB";
     repo = "WoeUSB-ng";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2opSiXbbk0zDRt6WqMh97iAt6/KhwNDopOas+OZn6TU=";
   };
 
+  build-system = [ python3Packages.setuptools ];
+
   postPatch = ''
     substituteInPlace setup.py WoeUSB/utils.py \
       --replace-fail "/usr/local/" "$out/" \
@@ -35,16 +35,22 @@ buildPythonApplication rec {
   ];
   dontWrapGApps = true;
   preFixup = ''
-    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+    makeWrapperArgs+=(
+      "''${gappsWrapperArgs[@]}"
+      --prefix PATH : "${
+        lib.makeBinPath [
+          p7zip
+          parted
+          grub2
+        ]
+      }"
+    )
   '';
 
-  propagatedBuildInputs = [
-    p7zip
-    parted
-    grub2
-    termcolor
-    wxpython
-    six
+  dependencies = [
+    python3Packages.termcolor
+    python3Packages.wxpython
+    python3Packages.six
   ];
 
   preConfigure = ''
@@ -59,7 +65,7 @@ buildPythonApplication rec {
     homepage = "https://github.com/WoeUSB/WoeUSB-ng";
     mainProgram = "woeusb";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ stunkymonkey ];
+    maintainers = [ lib.maintainers.stunkymonkey ];
     platforms = lib.platforms.linux;
   };
 }