From 25096a982657adb471e2d47275cacd8dee0e150c Mon Sep 17 00:00:00 2001
From: John Anderson <sontek@gmail.com>
Date: Thu, 30 Nov 2023 22:42:05 -0400
Subject: [PATCH 1/3] snowmachine: 1.0.1 -> 2.0.1

Snowmachine v2 has a few nice features like printing a christmas tree
and has a more modern packaging system.
---
 .../sn/snowmachine/package.nix}                     | 13 +++++++------
 pkgs/top-level/all-packages.nix                     |  2 --
 2 files changed, 7 insertions(+), 8 deletions(-)
 rename pkgs/{applications/misc/snowmachine/default.nix => by-name/sn/snowmachine/package.nix} (54%)

diff --git a/pkgs/applications/misc/snowmachine/default.nix b/pkgs/by-name/sn/snowmachine/package.nix
similarity index 54%
rename from pkgs/applications/misc/snowmachine/default.nix
rename to pkgs/by-name/sn/snowmachine/package.nix
index 022d75030d0a..c7da1dc6b00f 100644
--- a/pkgs/applications/misc/snowmachine/default.nix
+++ b/pkgs/by-name/sn/snowmachine/package.nix
@@ -1,16 +1,16 @@
-{ buildPythonPackage, lib, click, colorama, fetchPypi, setuptools-git }:
+{ python3Packages, lib, fetchPypi }:
 
-buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
   pname = "snowmachine";
-  version = "1.0.1";
+  version = "2.0.1";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1v385hhxy2a8vx5p0fhn0di8l4qfpb0a86j6nwsg0aw6ngb09qf1";
+    hash = "sha256:119e6da12f430af1519f1a9f091b77b7676c7a9dbeaab6616cb196fe793d8e61";
   };
 
-  buildInputs = [ setuptools-git ];
-  propagatedBuildInputs = [ click colorama ];
+  propagatedBuildInputs = with python3Packages; [ click colorama hatchling ];
 
   doCheck = false;
   pythonImportsCheck = [ "snowmachine" ];
@@ -18,6 +18,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "A python script that will make your terminal snow";
     homepage = "https://github.com/sontek/snowmachine";
+    mainProgram = "snowmachine";
     license = with licenses; [ bsd3 ];
     maintainers = with maintainers; [ djanatyn ];
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 886cda6033ce..7ad98d217518 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -41684,8 +41684,6 @@ with pkgs;
 
   snowsql = callPackage ../applications/misc/snowsql { };
 
-  snowmachine = python3Packages.callPackage ../applications/misc/snowmachine { };
-
   sidequest = callPackage ../applications/misc/sidequest { };
 
   maphosts = callPackage ../tools/networking/maphosts { };

From 0399a8cebb06c01f3c709d3b2288419e60eb2b5c Mon Sep 17 00:00:00 2001
From: John Anderson <sontek@gmail.com>
Date: Fri, 1 Dec 2023 00:14:10 -0400
Subject: [PATCH 2/3] maintainers: Add sontek

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8978a93c008b..cbba19154294 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16986,6 +16986,12 @@
     githubId = 9720532;
     name = "Sergei K";
   };
+  sontek = {
+    email = "sontek@gmail.com";
+    github = "sontek";
+    githubId = 151924;
+    name = "John Anderson";
+  };
   sophrosyne = {
     email = "joshuaortiz@tutanota.com";
     github = "sophrosyne97";

From faf5bc67d7a0dcef099c59024c90c182855e90a6 Mon Sep 17 00:00:00 2001
From: John Anderson <sontek@gmail.com>
Date: Fri, 1 Dec 2023 00:15:54 -0400
Subject: [PATCH 3/3] snowmachine: Add sontek as maintainer

---
 pkgs/by-name/sn/snowmachine/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sn/snowmachine/package.nix b/pkgs/by-name/sn/snowmachine/package.nix
index c7da1dc6b00f..a6d3aedf0b41 100644
--- a/pkgs/by-name/sn/snowmachine/package.nix
+++ b/pkgs/by-name/sn/snowmachine/package.nix
@@ -20,6 +20,6 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/sontek/snowmachine";
     mainProgram = "snowmachine";
     license = with licenses; [ bsd3 ];
-    maintainers = with maintainers; [ djanatyn ];
+    maintainers = with maintainers; [ djanatyn sontek ];
   };
 }