From 90cee57c0ca8e0d4c257234a8de5c722a62ef4ca Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Fri, 18 Apr 2025 20:04:05 -0700
Subject: [PATCH 1/2] swaytools: cleanup

---
 pkgs/tools/wayland/swaytools/default.nix | 20 ++++++++++----------
 pkgs/top-level/all-packages.nix          |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/wayland/swaytools/default.nix b/pkgs/tools/wayland/swaytools/default.nix
index 3f994ef03eb2..45884093a7a2 100644
--- a/pkgs/tools/wayland/swaytools/default.nix
+++ b/pkgs/tools/wayland/swaytools/default.nix
@@ -1,15 +1,13 @@
 {
   lib,
-  setuptools,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
   slurp,
+  nix-update-script,
 }:
-
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "swaytools";
   version = "0.1.2";
-
   format = "pyproject";
 
   src = fetchFromGitHub {
@@ -19,15 +17,17 @@ buildPythonApplication rec {
     sha256 = "sha256-UoWK53B1DNmKwNLFwJW1ZEm9dwMOvQeO03+RoMl6M0Q=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  nativeBuildInputs = with python3Packages; [ setuptools ];
 
   propagatedBuildInputs = [ slurp ];
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     homepage = "https://github.com/tmccombs/swaytools";
     description = "Collection of simple tools for sway (and i3)";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ atila ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ atila ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e02b83ccb7c4..07347ec2de57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2266,7 +2266,7 @@ with pkgs;
     wlroots = wlroots_0_18;
   };
 
-  swaytools = python3Packages.callPackage ../tools/wayland/swaytools { };
+  swaytools = callPackage ../tools/wayland/swaytools { };
 
   cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { };
 

From ea7f74c6c94c1039819309a601add2e01d6c2041 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Fri, 18 Apr 2025 20:05:04 -0700
Subject: [PATCH 2/2] swaytools: move to by-name

---
 .../swaytools/default.nix => by-name/sw/swaytools/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/wayland/swaytools/default.nix => by-name/sw/swaytools/package.nix} (100%)

diff --git a/pkgs/tools/wayland/swaytools/default.nix b/pkgs/by-name/sw/swaytools/package.nix
similarity index 100%
rename from pkgs/tools/wayland/swaytools/default.nix
rename to pkgs/by-name/sw/swaytools/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07347ec2de57..41f291e59e91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2266,8 +2266,6 @@ with pkgs;
     wlroots = wlroots_0_18;
   };
 
-  swaytools = callPackage ../tools/wayland/swaytools { };
-
   cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { };
 
   cplex = callPackage ../applications/science/math/cplex (config.cplex or { });