diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bf6db3..9f0ab51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -79,6 +79,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Fixed +- Report the version of the configured BTCPay Server package in the Hub instead of the different package version from unstable nixpkgs. - Installer VM compatibility: legacy BIOS VM boots now install with GRUB, UEFI VM installs avoid depending on NVRAM boot-entry writes, VM users get clearer disk/resource guidance, and the internet check falls back to HTTPS when ICMP is blocked. - **Manual Backup now matches the system role**: on the Desktop Only role the Hub's "What gets backed up" list no longer shows Node / Server + Desktop items diff --git a/app/sovran_systemsos_web/versions.json b/app/sovran_systemsos_web/versions.json index e5d89f1..aaaa176 100644 --- a/app/sovran_systemsos_web/versions.json +++ b/app/sovran_systemsos_web/versions.json @@ -6,7 +6,7 @@ "electrs.service": "0.10.6", "lnd.service": "0.18.0", "rtl.service": "0.15.2", - "btcpayserver.service": "2.0.0", + "btcpayserver.service": "2.4.2", "albyhub.service": "1.8.0", "mempool.service": "3.0.0", "matrix-synapse.service": "1.115.0", diff --git a/modules/core/sovran-hub.nix b/modules/core/sovran-hub.nix index 5e83536..c388461 100644 --- a/modules/core/sovran-hub.nix +++ b/modules/core/sovran-hub.nix @@ -136,7 +136,10 @@ let "electrs.service" = if pkgs ? electrs then pkgs.electrs.version else "0.10.6"; "lnd.service" = if pkgs ? lnd then pkgs.lnd.version else "0.18.0"; "rtl.service" = if pkgs ? clightning-rtl then pkgs.clightning-rtl.version else (if pkgs ? rtl then pkgs.rtl.version else "0.15.2"); - "btcpayserver.service" = if pkgs ? btcpayserver then pkgs.btcpayserver.version else "2.0.0"; + # BTCPay Server is intentionally sourced from pkgs.stable by the service + # module. Read the configured package here rather than pkgs.btcpayserver + # (unstable), otherwise the Hub can advertise a version that is not running. + "btcpayserver.service" = lib.getVersion config.services.btcpayserver.package; "albyhub.service" = if pkgs ? albyhub then pkgs.albyhub.version else "1.8.0"; "mempool.service" = if pkgs ? mempool then pkgs.mempool.version else "3.0.0"; "matrix-synapse.service" = if pkgs ? matrix-synapse then pkgs.matrix-synapse.version else "1.115.0";