From 504917d789a4c3c5597102345ac3e80ea3b96379 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 07:18:16 +0000
Subject: [PATCH 1/2] snagboot: 1.3 -> 2.1

---
 pkgs/applications/misc/snagboot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/snagboot/default.nix b/pkgs/applications/misc/snagboot/default.nix
index ccfe1fc9ab0b..ba9287214e81 100644
--- a/pkgs/applications/misc/snagboot/default.nix
+++ b/pkgs/applications/misc/snagboot/default.nix
@@ -10,14 +10,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "snagboot";
-  version = "1.3";
+  version = "2.1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "bootlin";
     repo = "snagboot";
     rev = "v${version}";
-    hash = "sha256-ergTa6uR1SyR27H2HAWp/rtgalCnQge07Pi24PrsW+8=";
+    hash = "sha256-1WyCzfvcvDpYybxV2Jt/Ty4i2ywapJmEAZtlvxe3dpQ=";
   };
 
   nativeBuildInputs = [

From 15d1616436b41db811017a8d249edd10dacae9cc Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 3 Feb 2025 18:30:20 -0500
Subject: [PATCH 2/2] snagboot: modernize

---
 pkgs/applications/misc/snagboot/default.nix | 28 ++++++++++++---------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/snagboot/default.nix b/pkgs/applications/misc/snagboot/default.nix
index ba9287214e81..4a0070aa3463 100644
--- a/pkgs/applications/misc/snagboot/default.nix
+++ b/pkgs/applications/misc/snagboot/default.nix
@@ -2,25 +2,26 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  python3,
+  python3Packages,
   snagboot,
   testers,
   gitUpdater,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "snagboot";
   version = "2.1";
-  format = "pyproject";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bootlin";
     repo = "snagboot";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1WyCzfvcvDpYybxV2Jt/Ty4i2ywapJmEAZtlvxe3dpQ=";
   };
 
-  nativeBuildInputs = [
+  build-system = with python3Packages; [
+    setuptools
   ];
 
   pythonRemoveDeps = [
@@ -28,18 +29,21 @@ python3.pkgs.buildPythonApplication rec {
     "swig"
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
-    setuptools
+  dependencies = with python3Packages; [
+    pyyaml
     pyusb
     pyserial
-    crccheck
-    six
-    xmodem
-    pyyaml
-    libfdt
     tftpy
+    crccheck
+    # pylibfdt
+    # swig
+    packaging
   ];
 
+  optional-dependencies = with python3Packages; {
+    gui = [ kivy ];
+  };
+
   postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
     rules="src/snagrecover/50-snagboot.rules"
     if [ ! -f "$rules" ]; then