Sovran_Systems/Sovran_SystemsOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Merge pull request #400 from naturallaw777/fix/final-clightning-both

Browse Source 
fix: remove clightning and clightning-rest from stubs to avoid duplic…
This commit is contained in:
Sovran Systems
2026-08-10 04:35:03 -05:00
committed by GitHub
parent 6b9c68e3b2 6c2c69d18a
commit 9f7dcfa6de
2 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/vendor/nix-bitcoin/lnd.nix
Vendored
+2 -2
View File
@@ -194,8 +194,8 @@ in {
assertions = [
{ assertion =
!(config.services ? clightning)
|| !(config.services.clightning.enable or false)
|| (config.services.clightning.port or 9735) != cfg.port;
|| !((config.services.clightning or {}).enable or false)
|| (((config.services.clightning or {}).port or 9735) != cfg.port);
message = ''
LND and clightning can't both bind to lightning port 9735. Either
disable LND/clightning or change services.clightning.port or
modules/vendor/nix-bitcoin/stubs.nix
Vendored
+5 -30
View File
@@ -1,50 +1,25 @@
{ config, lib, ... }:
{ lib, ... }:
with lib;
{
# Stubs for services that vendored nix-bitcoin modules reference
# but are not provided by nixpkgs/nixos-unstable 2026-08-08.
# Sovran never enables these — they just need to exist so evaluation doesn't throw
# "option does not exist".
# Stubs for services referenced by vendored nix-bitcoin modules but not in nixpkgs
# clightning and clightning-rest are NOT stubbed - they exist in nixpkgs f13ff45
# (clightning removed in 8b8c811, but handled via guards in btcpayserver/lnd)
# Other services don't exist in either nixpkgs version, so unconditional is safe.
options.services.clightning = mkOption { type = types.attrs; default = {}; description = "stub"; };
options.services.clightning.enable = mkOption { type = types.bool; default = false; };
options.services.clightning.port = mkOption { type = types.port; default = 9735; };
options.services.clightning.dataDir = mkOption { type = types.path; default = "/var/lib/clightning"; };
options.services.clightning.user = mkOption { type = types.str; default = "clightning"; };
options.services.clightning.group = mkOption { type = types.str; default = "clightning"; };
options.services.clightning.address = mkOption { type = types.str; default = "127.0.0.1"; };
options.services.clightning.rpc = mkOption { type = types.attrs; default = {}; };
options.services.clightning.networkDir = mkOption { type = types.path; default = "/var/lib/clightning/bitcoin"; };
options.services.clightning.plugins = mkOption { type = types.attrs; default = {}; };
options.services.clightning.plugins.clnrest = mkOption { type = types.attrs; default = {}; };
options.services.clightning.plugins.clnrest.enable = mkOption { type = types.bool; default = false; };
options.services.clightning.plugins.clnrest.address = mkOption { type = types.str; default = "127.0.0.1"; };
options.services.clightning.plugins.clnrest.port = mkOption { type = types.port; default = 3010; };
options.services.clightning-rest = mkOption { type = types.attrs; default = {}; };
options.services.clightning-rest.enable = mkOption { type = types.bool; default = false; };
options.services.liquidd = mkOption { type = types.attrs; default = {}; };
options.services.liquidd.enable = mkOption { type = types.bool; default = false; };
options.services.liquidd.dataDir = mkOption { type = types.path; default = "/var/lib/liquidd"; };
options.services.liquidd.address = mkOption { type = types.str; default = "127.0.0.1"; };
options.services.liquidd.port = mkOption { type = types.port; default = 7041; };
options.services.liquidd.rpc = mkOption { type = types.attrs; default = {}; };
options.services.liquidd.rpc.address = mkOption { type = types.str; default = "127.0.0.1"; };
options.services.liquidd.rpc.port = mkOption { type = types.port; default = 7040; };
options.services.liquidd.rpcuser = mkOption { type = types.str; default = "liquiddrpc"; };
options.services.liquidd.whitelistedPort = mkOption { type = types.port; default = 7042; };
options.services.liquidd.group = mkOption { type = types.str; default = "liquidd"; };
options.services.fulcrum = mkOption { type = types.attrs; default = {}; };
options.services.fulcrum.enable = mkOption { type = types.bool; default = false; };
options.services.lightning-loop = mkOption { type = types.attrs; default = {}; };
options.services.lightning-loop.enable = mkOption { type = types.bool; default = false; };
options.services.lightning-pool = mkOption { type = types.attrs; default = {}; };
options.services.lightning-pool.enable = mkOption { type = types.bool; default = false; };
options.services.joinmarket = mkOption { type = types.attrs; default = {}; };
options.services.joinmarket.enable = mkOption { type = types.bool; default = false; };
options.services.joinmarket-ob-watcher = mkOption { type = types.attrs; default = {}; };
options.services.joinmarket-ob-watcher.enable = mkOption { type = types.bool; default = false; };
}