Merge fort-nix/nix-bitcoin#643: clboss: 0.13A -> 0.13

b6df5cb130 clboss: 0.13A -> 0.13 (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK b6df5cb130

Tree-SHA512: c25352fca2a47de3e0b69637dd137bd6d127a99b5a7a138cdd011a243be2bd9e97bfd64a941894734f6c6e779e03db1b34696bfa66bfe59eb3155a6eeda5c90f

modules/clightning-plugins/clboss.nix

@@ -12,11 +12,6 @@ let cfg = config.services.clightning.plugins.clboss; in
         See also: https://github.com/ZmnSCPxj/clboss#operating
       '';
     };
-    acknowledgeDeprecation = mkOption {
-      type = types.bool;
-      default = false;
-      internal = true;
-    };
     min-onchain = mkOption {
       type = types.ints.positive;
       default = 30000;
@@ -54,22 +49,6 @@ let cfg = config.services.clightning.plugins.clboss; in
   };
 
   config = mkIf cfg.enable {
-    assertions = [
-      {
-        assertion = cfg.acknowledgeDeprecation;
-        message = ''
-          `clboss` is no longer maintained and has been deprecated.
-
-          Warning: For compatibility with clighting 23.05, the nix-bitcoin `clboss` package
-          includes a third-party fix that has not been thoroughly tested:
-          https://github.com/ZmnSCPxj/clboss/pull/162
-
-          To ignore this warning and continue using `clboss`, add the following to your config:
-          services.clightning.plugins.clboss.acknowledgeDeprecation = true;
-        '';
-      }
-    ];
-
     services.clightning.extraConfig = ''
       plugin=${cfg.package}/bin/clboss
       clboss-min-onchain=${toString cfg.min-onchain}

modules/obsolete-options.nix

@@ -100,6 +100,13 @@ in {
       Lightning) module or the clightning-rest module in combination with the
       Zeus mobile wallet.
     '')
+  ]
+  ++
+  # 0.0.98
+  [
+    (mkRemovedOptionModule [ "services" "clightning" "plugins" "clboss" "acknowledgeDeprecation" ] ''
+      `clboss` is maintained again and has been un-deprecated.
+    '')
   ];
   config = {
     # Migrate old clightning-rest datadir from nix-bitcoin versions < 0.0.70

pkgs/clboss/default.nix

@@ -1,33 +1,34 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, curl, libev, sqlite }:
+{ lib, stdenv, fetchFromGitHub, autoconf-archive, autoreconfHook, pkgconfig, curl, libev, sqlite }:
 
 let
   curlWithGnuTLS = curl.override { gnutlsSupport = true; opensslSupport = false; };
 in
 stdenv.mkDerivation rec {
   pname = "clboss";
-  version = "0.13A";
+  version = "0.13";
 
-  src = fetchurl {
-    url = "https://github.com/ZmnSCPxj/clboss/releases/download/${version}/clboss-${version}.tar.gz";
-    hash = "sha256-LTDJrm9Mk4j7Z++tKJKawEurgF1TnYuIoj+APbDHll4=";
+  src = fetchFromGitHub {
+    owner = "ZmnSCPxj";
+    repo = "clboss";
+    rev = "v${version}";
+    hash = "sha256-NP9blymdqDXo/OtGLQg/MXK24PpPvCrzqXRdtfCvpfI=";
   };
 
-  patches = [
-    # https://github.com/ZmnSCPxj/clboss/pull/162, required for clighting 23.05
-    (fetchpatch {
-      name = "fix-json-rpc";
-      url = "https://github.com/ZmnSCPxj/clboss/commit/a4bb0192550803db3d07628a29284a76f7204365.patch";
-      sha256 = "sha256-1iBJlOnt7n2xXNDgzH3PAvLryZcpM4VWNaWcEegbapQ=";
-    })
+  nativeBuildInputs = [
+    autoreconfHook
+    autoconf-archive
+    pkgconfig
+    libev
+    curlWithGnuTLS
+    sqlite
   ];
 
-  nativeBuildInputs = [ pkgconfig libev curlWithGnuTLS sqlite ];
-
   enableParallelBuilding = true;
 
   meta = with lib; {
     description = "Automated C-Lightning Node Manager";
     homepage = "https://github.com/ZmnSCPxj/clboss";
+    changelog = "https://github.com/ZmnSCPxj/clboss/blob/v${version}/ChangeLog";
     license = licenses.mit;
     maintainers = with maintainers; [ nixbitcoin ];
     platforms = platforms.linux;

test/tests.nix

@@ -148,7 +148,6 @@ let
     (mkIf config.test.features.clightningPlugins {
       services.clightning.plugins = {
         clboss.enable = true;
-        clboss.acknowledgeDeprecation = true;
         feeadjuster.enable = true;
         helpme.enable = true;
         monitor.enable = true;