From d7dc5ef9afca0e56aa399d2240e3d23d4fe99ee4 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 16 Nov 2024 18:28:13 +0100
Subject: [PATCH 1/3] nwg-panel: 0.9.48 -> 0.9.50

---
 pkgs/by-name/nw/nwg-panel/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nw/nwg-panel/package.nix b/pkgs/by-name/nw/nwg-panel/package.nix
index 11e886a482b7..e2c68a039eae 100644
--- a/pkgs/by-name/nw/nwg-panel/package.nix
+++ b/pkgs/by-name/nw/nwg-panel/package.nix
@@ -16,13 +16,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "nwg-panel";
-  version = "0.9.48";
+  version = "0.9.50";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-panel";
     rev = "refs/tags/v${version}";
-    hash = "sha256-/PMUkD2kr8aqmohStntlTOc5XgfR+A3LaeYsk04GvOM=";
+    hash = "sha256-/WJpxFmQ6ED/PWW9/qIp5VheBgAukLIwRSdOxfPoyKM=";
   };
 
   # No tests

From 259125e15c5657b8224cb5fefa5b224c42a64d78 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 16 Nov 2024 18:28:45 +0100
Subject: [PATCH 2/3] nwg-panel: format with nixfmt

---
 pkgs/by-name/nw/nwg-panel/package.nix | 74 ++++++++++++++++++++-------
 1 file changed, 55 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/nw/nwg-panel/package.nix b/pkgs/by-name/nw/nwg-panel/package.nix
index e2c68a039eae..4663b81588e1 100644
--- a/pkgs/by-name/nw/nwg-panel/package.nix
+++ b/pkgs/by-name/nw/nwg-panel/package.nix
@@ -1,17 +1,24 @@
-{ lib, fetchFromGitHub
-, python3Packages, wrapGAppsHook3, gobject-introspection
-, gtk-layer-shell, pango, gdk-pixbuf, atk
-# Extra packages called by various internal nwg-panel modules
-, hyprland         # hyprctl
-, sway             # swaylock, swaymsg
-, systemd          # systemctl
-, wlr-randr        # wlr-randr
-, nwg-menu         # nwg-menu
-, brightnessctl    # brightnessctl
-, pamixer          # pamixer
-, pulseaudio       # pactl
-, libdbusmenu-gtk3 # tray
-, playerctl
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+  wrapGAppsHook3,
+  gobject-introspection,
+  gtk-layer-shell,
+  pango,
+  gdk-pixbuf,
+  atk,
+  # Extra packages called by various internal nwg-panel modules
+  hyprland, # hyprctl
+  sway, # swaylock, swaymsg
+  systemd, # systemctl
+  wlr-randr, # wlr-randr
+  nwg-menu, # nwg-menu
+  brightnessctl, # brightnessctl
+  pamixer, # pamixer
+  pulseaudio, # pactl
+  libdbusmenu-gtk3, # tray
+  playerctl,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -32,10 +39,28 @@ python3Packages.buildPythonApplication rec {
   strictDeps = false;
   dontWrapGApps = true;
 
-  buildInputs = [ atk gdk-pixbuf gtk-layer-shell pango playerctl ];
-  nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ];
-  propagatedBuildInputs = (with python3Packages;
-    [ i3ipc netifaces psutil pybluez pygobject3 requests dasbus setuptools ])
+  buildInputs = [
+    atk
+    gdk-pixbuf
+    gtk-layer-shell
+    pango
+    playerctl
+  ];
+  nativeBuildInputs = [
+    wrapGAppsHook3
+    gobject-introspection
+  ];
+  propagatedBuildInputs =
+    (with python3Packages; [
+      i3ipc
+      netifaces
+      psutil
+      pybluez
+      pygobject3
+      requests
+      dasbus
+      setuptools
+    ])
     # Run-time GTK dependency required by the Tray module
     ++ [ libdbusmenu-gtk3 ];
 
@@ -49,7 +74,18 @@ python3Packages.buildPythonApplication rec {
     makeWrapperArgs+=(
       "''${gappsWrapperArgs[@]}"
       --prefix XDG_DATA_DIRS : "$out/share"
-      --prefix PATH : "${lib.makeBinPath [ brightnessctl hyprland nwg-menu pamixer pulseaudio sway systemd wlr-randr ]}"
+      --prefix PATH : "${
+        lib.makeBinPath [
+          brightnessctl
+          hyprland
+          nwg-menu
+          pamixer
+          pulseaudio
+          sway
+          systemd
+          wlr-randr
+        ]
+      }"
     )
   '';
 

From 0a6862aa2c5ff9b5ef1fc8572f2da30880d5b599 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 16 Nov 2024 18:30:11 +0100
Subject: [PATCH 3/3] nwg-panel: avoid `with lib;`

---
 pkgs/by-name/nw/nwg-panel/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/nw/nwg-panel/package.nix b/pkgs/by-name/nw/nwg-panel/package.nix
index 4663b81588e1..1d415901d616 100644
--- a/pkgs/by-name/nw/nwg-panel/package.nix
+++ b/pkgs/by-name/nw/nwg-panel/package.nix
@@ -89,13 +89,13 @@ python3Packages.buildPythonApplication rec {
     )
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/nwg-piotr/nwg-panel";
     changelog = "https://github.com/nwg-piotr/nwg-panel/releases/tag/v${version}";
     description = "GTK3-based panel for Sway window manager";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ ludovicopiero ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ludovicopiero ];
     mainProgram = "nwg-panel";
   };
 }