From ea5608d8251637569ceeae1645e1c7ce7eb9f19e Mon Sep 17 00:00:00 2001
From: Philipp Bartsch <phil@grmr.de>
Date: Sun, 27 Jul 2025 21:21:31 +0200
Subject: [PATCH] usbguard: cleanup

---
 pkgs/by-name/us/usbguard/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/us/usbguard/package.nix b/pkgs/by-name/us/usbguard/package.nix
index 5a6e5976de3a..5f575755a7fb 100644
--- a/pkgs/by-name/us/usbguard/package.nix
+++ b/pkgs/by-name/us/usbguard/package.nix
@@ -21,14 +21,14 @@
   libsodium,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "1.1.4";
   pname = "usbguard";
 
   src = fetchFromGitHub {
     owner = "USBGuard";
     repo = "usbguard";
-    rev = "usbguard-${version}";
+    tag = "usbguard-${finalAttrs.version}";
     hash = "sha256-PDuYszdG6BK4fkAHWWBct1d7tnwwe+5XOw+xmSPoPCY=";
     fetchSubmodules = true;
   };
@@ -74,17 +74,17 @@ stdenv.mkDerivation rec {
 
   passthru.tests = nixosTests.usbguard;
 
-  meta = with lib; {
-    description = "USBGuard software framework helps to protect your computer against BadUSB";
+  meta = {
+    description = "Protect your computer against rogue USB devices (a.k.a. BadUSB)";
     longDescription = ''
       USBGuard is a software framework for implementing USB device authorization
       policies (what kind of USB devices are authorized) as well as method of
       use policies (how a USB device may interact with the system). Simply put,
-      it is a USB device whitelisting tool.
+      it is a USB device allowlisting tool.
     '';
     homepage = "https://usbguard.github.io/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.tnias ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.tnias ];
   };
-}
+})