From 7e2ce73bbd7e0e0678b4a9402d215bf1b26f6745 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Fri, 1 Nov 2024 23:00:35 +0800
Subject: [PATCH 1/3] valent: move to pkgs/by-name

---
 .../misc/valent/default.nix => by-name/va/valent/package.nix}   | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/misc/valent/default.nix => by-name/va/valent/package.nix} (100%)

diff --git a/pkgs/applications/misc/valent/default.nix b/pkgs/by-name/va/valent/package.nix
similarity index 100%
rename from pkgs/applications/misc/valent/default.nix
rename to pkgs/by-name/va/valent/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 364bf2acce85..0a6bc6873f6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37828,8 +37828,6 @@ with pkgs;
 
   unixcw = libsForQt5.callPackage ../applications/radio/unixcw { };
 
-  valent = callPackage ../applications/misc/valent { };
-
   vault-medusa = callPackage ../tools/security/vault-medusa { };
 
   vault-ssh-plus = callPackage ../tools/security/vault-ssh-plus { };

From 74d7928a957526155bf5b77955461e23910cd059 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Fri, 1 Nov 2024 23:01:05 +0800
Subject: [PATCH 2/3] valent: format with nixfmt-rfc-style

---
 pkgs/by-name/va/valent/package.nix | 53 ++++++++++++++++--------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/va/valent/package.nix b/pkgs/by-name/va/valent/package.nix
index 2b3ad209759a..da08ac7a7dd5 100644
--- a/pkgs/by-name/va/valent/package.nix
+++ b/pkgs/by-name/va/valent/package.nix
@@ -1,26 +1,27 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, desktop-file-utils
-, meson
-, ninja
-, pkg-config
-, wrapGAppsHook4
-, vala
-, evolution-data-server-gtk4
-, gdk-pixbuf
-, glib
-, glib-networking
-, gnutls
-, gst_all_1
-, json-glib
-, libadwaita
-, libpeas2
-, libphonenumber
-, libportal-gtk4
-, pipewire
-, pulseaudio
-, tinysparql
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  desktop-file-utils,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook4,
+  vala,
+  evolution-data-server-gtk4,
+  gdk-pixbuf,
+  glib,
+  glib-networking,
+  gnutls,
+  gst_all_1,
+  json-glib,
+  libadwaita,
+  libpeas2,
+  libphonenumber,
+  libportal-gtk4,
+  pipewire,
+  pulseaudio,
+  tinysparql,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -88,7 +89,11 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://valent.andyholmes.ca";
     changelog = "https://github.com/andyholmes/valent/blob/${finalAttrs.src.rev}/CHANGELOG.md";
-    license = with lib.licenses; [ gpl3Plus cc0 cc-by-sa-30 ];
+    license = with lib.licenses; [
+      gpl3Plus
+      cc0
+      cc-by-sa-30
+    ];
     maintainers = with lib.maintainers; [ aleksana ];
     platforms = lib.platforms.linux;
   };

From 7d7b8f81897ea212703abd9fec4167d853221d62 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Fri, 1 Nov 2024 23:15:19 +0800
Subject: [PATCH 3/3] valent: 1.0.0.alpha.46 ->
 1.0.0.alpha.46-unstable-2024-10-26

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

diff --git a/pkgs/by-name/va/valent/package.nix b/pkgs/by-name/va/valent/package.nix
index da08ac7a7dd5..951ebb5a6069 100644
--- a/pkgs/by-name/va/valent/package.nix
+++ b/pkgs/by-name/va/valent/package.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "valent";
-  version = "1.0.0.alpha.46";
+  version = "1.0.0.alpha.46-unstable-2024-10-26";
 
   src = fetchFromGitHub {
     owner = "andyholmes";
     repo = "valent";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-DpDHU1l8Pot0RwVR1rL9fIhMHo18eo7nTecnSa3hG2E=";
+    rev = "165a2791d4bf3e7dee69e3dd7885dbe4948265b9";
+    hash = "sha256-7klvOvwyAg+Xno6zWo8UByjaS9OkOuCceuZcAIEgdyU=";
     fetchSubmodules = true;
   };
 
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   mesonFlags = [
-    "-Dplugin_bluez=true"
+    (lib.mesonBool "plugin_bluez" true)
   ];
 
   meta = {