From ebf799b962c4647eaa5922862382a97ba3f29612 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 21 Feb 2025 09:27:04 +0100
Subject: [PATCH] waybar: 0.11.0 -> 0.12.0

Diff: https://github.com/Alexays/Waybar/compare/refs/tags/0.11.0...0.12.0

Changelog: https://github.com/alexays/waybar/releases/tag/0.12.0
---
 pkgs/by-name/wa/waybar/package.nix | 32 ++++++++++--------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix
index 51ec93c1bc08..9b61bae8837d 100644
--- a/pkgs/by-name/wa/waybar/package.nix
+++ b/pkgs/by-name/wa/waybar/package.nix
@@ -6,7 +6,6 @@
   SDL2,
   alsa-lib,
   catch2_3,
-  fetchpatch,
   fftw,
   glib,
   gobject-introspection,
@@ -42,6 +41,7 @@
   sway,
   udev,
   upower,
+  versionCheckHook,
   wayland,
   wayland-scanner,
   wireplumber,
@@ -71,36 +71,22 @@
   wireplumberSupport ? true,
   withMediaPlayer ? mprisSupport && false,
   nix-update-script,
-  testers,
-  waybar,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "waybar";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "Alexays";
     repo = "Waybar";
     tag = finalAttrs.version;
-    hash = "sha256-3lc0voMU5RS+mEtxKuRayq/uJO09X7byq6Rm5NZohq8=";
+    hash = "sha256-VpT3ePqmo75Ni6/02KFGV6ltnpiV70/ovG/p1f2wKkU=";
   };
 
-  patches = [
-    # Fix a regression introduced in release 0.11.0
-    # TODO: remove this patch when updating to the next release
-    # Issue: https://github.com/Alexays/Waybar/issues/3597
-    # PR: https://github.com/Alexays/Waybar/pull/3604
-    (fetchpatch {
-      name = "fix-tray";
-      url = "https://github.com/Alexays/Waybar/commit/0d02f6877d88551ea2be0cd151c1e6354e208b1c.patch";
-      hash = "sha256-wpdK6AY+14jt85dOQy6xkh8tNGDN2F9GA9zOfAuOaIc=";
-    })
-  ];
-
   postUnpack = lib.optional cavaSupport ''
     pushd "$sourceRoot"
-    cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.2
+    cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.3
     patchShebangs .
     popd
   '';
@@ -204,12 +190,14 @@ stdenv.mkDerivation (finalAttrs: {
       --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}"
   '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
   passthru = {
     updateScript = nix-update-script { };
-    tests.version = testers.testVersion {
-      package = waybar;
-      version = "v${finalAttrs.version}";
-    };
   };
 
   meta = {