From c8186680c3bd04ebe97272ab110cd7cecb97bd5c Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Sat, 8 Jun 2024 14:32:26 +0200
Subject: [PATCH 1/2] xmonad-log: 0.1.0 -> 0.1.0-unstable-2024-06-14

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 pkgs/tools/misc/xmonad-log/default.nix | 15 +++++++--------
 pkgs/tools/misc/xmonad-log/deps.nix    | 12 ------------
 2 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/tools/misc/xmonad-log/deps.nix

diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/pkgs/tools/misc/xmonad-log/default.nix
index 9ba7941b45f7..385d5edf90cf 100644
--- a/pkgs/tools/misc/xmonad-log/default.nix
+++ b/pkgs/tools/misc/xmonad-log/default.nix
@@ -1,19 +1,18 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule {
   pname = "xmonad-log";
-  version = "0.1.0";
-
-  goPackagePath = "github.com/xintron/xmonad-log";
+  version = "0.1.0-unstable-2024-06-14";
 
   src = fetchFromGitHub {
     owner = "xintron";
     repo = "xmonad-log";
-    rev = version;
-    sha256 = "1il6v0zcjw0pfb1hjj198y94jmlcx255h422ph0f1zr7afqkzmaw";
+    rev = "70c76d59c22cf5f412467cd42fa9ff34eeb2bd1b";
+    sha256 = "sha256-hDYb3mSX2+FX/2uazCKPXmNj0avDlutwSMjST7wLBVY=";
   };
 
-  goDeps = ./deps.nix;
+  vendorHash = "sha256-58zK6t3rb+19ilaQaNgsMVFQBYKPIV40ww8klrGbpnw=";
+  proxyVendor = true;
 
   meta = with lib; {
     description = "xmonad DBus monitoring solution";
diff --git a/pkgs/tools/misc/xmonad-log/deps.nix b/pkgs/tools/misc/xmonad-log/deps.nix
deleted file mode 100644
index f5a7c7e5dd1d..000000000000
--- a/pkgs/tools/misc/xmonad-log/deps.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-[
-  {
-    goPackagePath = "github.com/godbus/dbus";
-    fetch = {
-      type = "git";
-      url = "https://github.com/godbus/dbus";
-      rev = "a389bdde4dd695d414e47b755e95e72b7826432c";
-      sha256 = "1ckvg15zdsgmbn4mi36cazkb407ixc9mmyf7vwj8b8wi3d00rgn9";
-    };
-  }
-]

From fa547edc660719b6593514ea551a49c341aa877f Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Mon, 17 Jun 2024 08:29:37 +0200
Subject: [PATCH 2/2] xmonad-log: move to by-name

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 .../default.nix => by-name/xm/xmonad-log/package.nix}           | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/misc/xmonad-log/default.nix => by-name/xm/xmonad-log/package.nix} (100%)

diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/pkgs/by-name/xm/xmonad-log/package.nix
similarity index 100%
rename from pkgs/tools/misc/xmonad-log/default.nix
rename to pkgs/by-name/xm/xmonad-log/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ac8d35e86b8..2990f77a36c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -35655,8 +35655,6 @@ with pkgs;
 
   xmobar = haskellPackages.xmobar.bin;
 
-  xmonad-log = callPackage ../tools/misc/xmonad-log { };
-
   xmonad-with-packages = callPackage ../applications/window-managers/xmonad/wrapper.nix {
     inherit (haskellPackages) ghcWithPackages;
     packages = _: [ haskellPackages.xmonad-contrib ];