From 0e0ffd4b728540c5d0ddd0cb949b49ffac2f07a8 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sun, 14 Jul 2024 13:53:53 +0200
Subject: [PATCH 1/3] obconf: use finalAttrs, hash instead of sha256

---
 pkgs/tools/X11/obconf/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix
index 02fe2663b002..aade67270152 100644
--- a/pkgs/tools/X11/obconf/default.nix
+++ b/pkgs/tools/X11/obconf/default.nix
@@ -12,14 +12,14 @@
 , openbox
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "obconf";
   version = "unstable-2015-02-13";
 
   src = fetchgit {
     url = "git://git.openbox.org/dana/obconf";
     rev = "63ec47c5e295ad4f09d1df6d92afb7e10c3fec39";
-    sha256 = "sha256-qwm66VA/ueRMFtSUcrmuObNkz+KYgWRnmR7TnQwpxiE=";
+    hash = "sha256-qwm66VA/ueRMFtSUcrmuObNkz+KYgWRnmR7TnQwpxiE=";
   };
 
   nativeBuildInputs = [
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    substituteInPlace configure.ac --replace 2.0.4 ${version}
+    substituteInPlace configure.ac --replace 2.0.4 ${finalAttrs.version}
   '';
 
   meta = {
@@ -50,4 +50,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     mainProgram = "obconf";
   };
-}
+})

From 20d8ea02b3b286125ff1cb9986061f90f0e3f733 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sun, 14 Jul 2024 13:54:16 +0200
Subject: [PATCH 2/3] obconf: reformat for RFC166

---
 pkgs/tools/X11/obconf/default.nix | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix
index aade67270152..9b233017b4ea 100644
--- a/pkgs/tools/X11/obconf/default.nix
+++ b/pkgs/tools/X11/obconf/default.nix
@@ -1,15 +1,16 @@
-{ lib
-, stdenv
-, fetchgit
-, autoreconfHook
-, pkg-config
-, wrapGAppsHook3
-, gtk3
-, imlib2
-, libSM
-, libstartup_notification
-, libxml2
-, openbox
+{
+  lib,
+  stdenv,
+  fetchgit,
+  autoreconfHook,
+  pkg-config,
+  wrapGAppsHook3,
+  gtk3,
+  imlib2,
+  libSM,
+  libstartup_notification,
+  libxml2,
+  openbox,
 }:
 
 stdenv.mkDerivation (finalAttrs: {

From aa9ffbf2b0d96c86b9e0fa6faf42cbc4a60e3db4 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sun, 14 Jul 2024 13:54:59 +0200
Subject: [PATCH 3/3] obconf: move to by-name

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

diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/by-name/ob/obconf/package.nix
similarity index 100%
rename from pkgs/tools/X11/obconf/default.nix
rename to pkgs/by-name/ob/obconf/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e74e5060f2e7..e0af508c9820 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33015,8 +33015,6 @@ with pkgs;
 
   nvpy = callPackage ../applications/editors/nvpy { };
 
-  obconf = callPackage ../tools/X11/obconf { };
-
   gnome-obfuscate = callPackage ../applications/graphics/gnome-obfuscate {
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };