From af87d5958acc7c93acdaf32edac8ab539792c65f Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Thu, 1 Jun 2023 14:01:31 +0200
Subject: [PATCH] obsolete-options: simplify removal of clightning plugin
 `commando`

---
 modules/obsolete-options.nix | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/modules/obsolete-options.nix b/modules/obsolete-options.nix
index f6dcfd3..eaaf841 100644
--- a/modules/obsolete-options.nix
+++ b/modules/obsolete-options.nix
@@ -82,20 +82,15 @@ in {
     "electrs"
   ]) ++
   # 0.0.77
-  (
-    let
-      optionName = [ "services" "clightning" "plugins" "commando" ];
-    in [
-      (mkRemovedOptionModule (optionName ++ [ "enable" ]) ''
-        clightning 0.12.0 ships with a reimplementation of the commando plugin
-        that is incompatible with the commando module that existed in
-        nix-bitcoin. The new built-in commando plugin is always enabled. For
-        information on how to use it, run `lightning-cli help commando` and
-        `lightning-cli help commando-rune`.
-      '')
-      (mkRemovedOptionModule (optionName ++ [ "readers" ]) "")
-      (mkRemovedOptionModule (optionName ++ [ "writers" ]) "")
-  ]) ++
+  [
+    (mkRemovedOptionModule [ "services" "clightning" "plugins" "commando" ] ''
+      clightning 0.12.0 ships with a reimplementation of the commando plugin
+      that is incompatible with the commando module that existed in
+      nix-bitcoin. The new built-in commando plugin is always enabled. For
+      information on how to use it, run `lightning-cli help commando` and
+      `lightning-cli help commando-rune`.
+    '')
+  ] ++
   # 0.0.92
   [
     (mkRemovedOptionModule [ "services" "spark-wallet" ] ''