From 2d8cfea95d5122d7776f0663c20bb4920e3ebe50 Mon Sep 17 00:00:00 2001
From: Albert Safin <xzfcpw@gmail.com>
Date: Mon, 13 May 2024 00:00:56 +0000
Subject: [PATCH 1/4] bevelbar: move to by-name

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

diff --git a/pkgs/tools/X11/bevelbar/default.nix b/pkgs/by-name/be/bevelbar/package.nix
similarity index 100%
rename from pkgs/tools/X11/bevelbar/default.nix
rename to pkgs/by-name/be/bevelbar/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f133b168a9f..21455eba68db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6477,8 +6477,6 @@ with pkgs;
 
   bfs = callPackage ../tools/system/bfs { };
 
-  bevelbar = callPackage ../tools/X11/bevelbar { };
-
   bgs = callPackage ../tools/X11/bgs { };
 
   bibclean = callPackage ../tools/typesetting/bibclean { };

From a6326e273ba90eba32bc2f736b2cd2f33930b6f5 Mon Sep 17 00:00:00 2001
From: Albert Safin <xzfcpw@gmail.com>
Date: Mon, 13 May 2024 00:03:43 +0000
Subject: [PATCH 2/4] bevelbar: format with nixfmt and remove `with lib;`

---
 pkgs/by-name/be/bevelbar/package.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/be/bevelbar/package.nix b/pkgs/by-name/be/bevelbar/package.nix
index 7eab7a65e80a..bed84141944c 100644
--- a/pkgs/by-name/be/bevelbar/package.nix
+++ b/pkgs/by-name/be/bevelbar/package.nix
@@ -1,4 +1,5 @@
-{ lib,
+{
+  lib,
   stdenv,
   fetchurl,
   pkg-config,
@@ -16,9 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-8ceFwQFHhJ1qEXJtzoDXU0XRgudaAfsoWq7LYgGEqsM=";
   };
 
-  nativeBuildInputs = [
-    pkg-config
-  ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
     libX11
@@ -28,11 +27,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [ "prefix=$(out)" ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.uninformativ.de/git/bevelbar/file/README.html";
     description = "X11 status bar with beveled borders";
-    license = licenses.mit;
-    maintainers = with maintainers; [ AndersonTorres neeasade ];
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      AndersonTorres
+      neeasade
+    ];
+    platforms = lib.platforms.linux;
   };
 })

From dca280c9ca8349143e5f5a28b54140befc1b1dc6 Mon Sep 17 00:00:00 2001
From: Albert Safin <xzfcpw@gmail.com>
Date: Mon, 13 May 2024 00:06:18 +0000
Subject: [PATCH 3/4] bevelbar: add updateScript

---
 pkgs/by-name/be/bevelbar/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/be/bevelbar/package.nix b/pkgs/by-name/be/bevelbar/package.nix
index bed84141944c..1fd5a592d70d 100644
--- a/pkgs/by-name/be/bevelbar/package.nix
+++ b/pkgs/by-name/be/bevelbar/package.nix
@@ -6,6 +6,7 @@
   libX11,
   libXft,
   libXrandr,
+  gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -27,6 +28,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [ "prefix=$(out)" ];
 
+  passthru.updateScript = gitUpdater {
+    url = "https://www.uninformativ.de/git/bevelbar.git/";
+    rev-prefix = "v";
+  };
+
   meta = {
     homepage = "https://www.uninformativ.de/git/bevelbar/file/README.html";
     description = "X11 status bar with beveled borders";

From 82e9676428133f468bed082055ca3e9a2dc1023b Mon Sep 17 00:00:00 2001
From: Albert Safin <xzfcpw@gmail.com>
Date: Mon, 13 May 2024 00:07:14 +0000
Subject: [PATCH 4/4] bevelbar: 22.06 -> 23.08

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

diff --git a/pkgs/by-name/be/bevelbar/package.nix b/pkgs/by-name/be/bevelbar/package.nix
index 1fd5a592d70d..60dfb62567bf 100644
--- a/pkgs/by-name/be/bevelbar/package.nix
+++ b/pkgs/by-name/be/bevelbar/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bevelbar";
-  version = "22.06";
+  version = "23.08";
 
   src = fetchurl {
     url = "https://www.uninformativ.de/git/bevelbar/archives/bevelbar-v${finalAttrs.version}.tar.gz";
-    hash = "sha256-8ceFwQFHhJ1qEXJtzoDXU0XRgudaAfsoWq7LYgGEqsM=";
+    hash = "sha256-4wMSPi9tu+z1AW2uvPefxkeT/5DYo2oJybhNnpe82QU=";
   };
 
   nativeBuildInputs = [ pkg-config ];