From 9add0986c865cf7e984fad731c79d5d8cf20a1e6 Mon Sep 17 00:00:00 2001
From: luftmensch-luftmensch <valentinobocchetti59@gmail.com>
Date: Wed, 12 Jun 2024 11:59:13 +0200
Subject: [PATCH 1/2] sfwbar: 1.0_beta13 -> 1.0_beta14

---
 pkgs/applications/misc/sfwbar/default.nix | 44 ++++++++++++-----------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/misc/sfwbar/default.nix b/pkgs/applications/misc/sfwbar/default.nix
index bc96dbe2c317..d4cd21a9cb00 100644
--- a/pkgs/applications/misc/sfwbar/default.nix
+++ b/pkgs/applications/misc/sfwbar/default.nix
@@ -1,18 +1,18 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, gtk3
-, meson
-, ninja
-, json_c
-, pkg-config
-, gtk-layer-shell
-, libpulseaudio
-, libmpdclient
-, libxkbcommon
-, alsa-lib
-, makeWrapper
-,
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gtk3,
+  meson,
+  ninja,
+  json_c,
+  pkg-config,
+  gtk-layer-shell,
+  libpulseaudio,
+  libmpdclient,
+  libxkbcommon,
+  alsa-lib,
+  makeWrapper,
 }:
 stdenv.mkDerivation rec {
   pname = "sfwbar";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     owner = "LBCrion";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-7oiuTEqdXDReKdakJX6+HRaSi1XovM+MkHFkaFZtq64=";
+    hash = "sha256-4brP1SXaWq/L0D87rvlrWhLU1oFPSwNNxBSzRr4jsTM=";
   };
 
   buildInputs = [
@@ -47,12 +47,16 @@ stdenv.mkDerivation rec {
       --suffix XDG_DATA_DIRS : $out/share
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/LBCrion/sfwbar";
     description = "Flexible taskbar application for wayland compositors, designed with a stacking layout in mind";
+    changelog = "https://github.com/LBCrion/sfwbar/releases/tag/v${version}";
     mainProgram = "sfwbar";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ NotAShelf ];
-    license = licenses.gpl3Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      luftmensch-luftmensch
+      NotAShelf
+    ];
+    license = lib.licenses.gpl3Only;
   };
 }

From 3532ff0eaee85d55cf31c8b80a52c029ac618fad Mon Sep 17 00:00:00 2001
From: luftmensch-luftmensch <valentinobocchetti59@gmail.com>
Date: Wed, 12 Jun 2024 12:01:02 +0200
Subject: [PATCH 2/2] sfwbar: move to pkgs/by-name

---
 .../sfwbar/default.nix => by-name/sf/sfwbar/package.nix} | 9 ++++++---
 pkgs/top-level/all-packages.nix                          | 2 --
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename pkgs/{applications/misc/sfwbar/default.nix => by-name/sf/sfwbar/package.nix} (92%)

diff --git a/pkgs/applications/misc/sfwbar/default.nix b/pkgs/by-name/sf/sfwbar/package.nix
similarity index 92%
rename from pkgs/applications/misc/sfwbar/default.nix
rename to pkgs/by-name/sf/sfwbar/package.nix
index d4cd21a9cb00..712040333536 100644
--- a/pkgs/applications/misc/sfwbar/default.nix
+++ b/pkgs/by-name/sf/sfwbar/package.nix
@@ -14,13 +14,16 @@
   alsa-lib,
   makeWrapper,
 }:
-stdenv.mkDerivation rec {
+let
+  version = "1.0_beta14";
+in
+stdenv.mkDerivation {
   pname = "sfwbar";
-  version = "1.0_beta13";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "LBCrion";
-    repo = pname;
+    repo = "sfwbar";
     rev = "v${version}";
     hash = "sha256-4brP1SXaWq/L0D87rvlrWhLU1oFPSwNNxBSzRr4jsTM=";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 169e0f6bc72c..b94a66137bf1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31647,8 +31647,6 @@ with pkgs;
     singularity-overriden-nixos
     ;
 
-  sfwbar = callPackage ../applications/misc/sfwbar { };
-
   skate = callPackage ../applications/misc/skate { };
 
   slack = callPackage ../applications/networking/instant-messengers/slack { };