From aed1ed5bd6a8fcfe70b9ae19a69411edcae53f88 Mon Sep 17 00:00:00 2001 From: Sovran Systems Date: Sun, 18 Oct 2026 19:39:43 +0000 Subject: [PATCH] chore: update flake.lock (nixpkgs, Sovran_Bitcoin 1.1.1, Bisq2 2.1.14) and integration - Update flake.lock inputs: - sovran-bitcoin: b0da63b -> 50a8b76 (1.1.1 with RTL 0.15.13 and Nix-native sovran-nwc 2.0.0) - nixpkgs (nixos-unstable): c59305b -> fe13242 (Caddy 2.11.7, Tor 0.4.9.14, GNOME Remote Desktop 50.2, Bitcoin Core 31.1, Electrs 0.12.0, LND 0.21.4-beta, BTCPay Server 2.4.5, Matrix Synapse 1.162.0, LiveKit 1.13.8, Vaultwarden 1.37.4, Haven 1.2.2) - nixpkgs-stable (nixos-26.05): 78e9c78 -> 26f4107 - btc-clients: 99b0442 -> 990d29e (Bisq 1.10.9, Bisq2 2.1.14, Sparrow 2.5.5) - nixvim: 5980a62 -> 453dc9c - flake.nix: replace deprecated pkgs.system with pkgs.stdenv.hostPlatform.system for btc-clients packages - modules/sovran-bitcoin-integration.nix: guard config.networking.domain against null/empty when both haven and nwc-wallets features are enabled - app/sovran_systemsos_web/versions.json: sync static fallback service versions with updated flake inputs - CHANGELOG.md: document updates under [Unreleased] --- CHANGELOG.md | 5 +++ app/sovran_systemsos_web/versions.json | 28 ++++++------ flake.lock | 60 +++++++++++++------------- flake.nix | 6 +-- modules/sovran-bitcoin-integration.nix | 2 +- 5 files changed, 53 insertions(+), 48 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10ead10..c5a5abb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Mullvad: install the VPN app and daemon, as NixOS ships them, on the Desktop Role only +### Changed +- Updated `flake.lock` (`nixpkgs`, `nixpkgs-stable`, `nixvim`, `btc-clients` with Bisq2 `2.1.14`, and `Sovran_Bitcoin` `1.1.1` with RTL `0.15.13` and Nix-native `sovran-nwc` `2.0.0`) +- Updated fallback service version map (`app/sovran_systemsos_web/versions.json`) +- Fixed deprecated `pkgs.system` reference in `flake.nix` and guarded `config.networking.domain` in `modules/sovran-bitcoin-integration.nix` when `haven` and `nwc-wallets` are both enabled + --- ## [1.2.0] - 2026-10-02 diff --git a/app/sovran_systemsos_web/versions.json b/app/sovran_systemsos_web/versions.json index b076d6c..2c3300e 100644 --- a/app/sovran_systemsos_web/versions.json +++ b/app/sovran_systemsos_web/versions.json @@ -1,16 +1,16 @@ { - "caddy.service": "2.8.4", - "tor.service": "0.4.8.12", - "gnome-remote-desktop.service": "46.0", - "bitcoind.service": "27.1.0", - "electrs.service": "0.10.6", - "lnd.service": "0.18.0", - "rtl.service": "0.15.12", - "btcpayserver.service": "2.4.2", - "albyhub.service": "1.24.0", - "mempool.service": "3.2.1", - "matrix-synapse.service": "1.115.0", - "livekit.service": "1.13.6", - "vaultwarden.service": "1.32.0", - "haven-relay.service": "0.1.0" + "caddy.service": "2.11.7", + "tor.service": "0.4.9.14", + "gnome-remote-desktop.service": "50.2", + "bitcoind.service": "31.1", + "electrs.service": "0.12.0", + "lnd.service": "0.21.4-beta", + "rtl.service": "0.15.13", + "btcpayserver.service": "2.4.5", + "albyhub.service": "2.0.0", + "mempool.service": "3.3.1", + "matrix-synapse.service": "1.162.0", + "livekit.service": "1.13.8", + "vaultwarden.service": "1.37.4", + "haven-relay.service": "1.2.2" } diff --git a/flake.lock b/flake.lock index cf0e16c..2207317 100755 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1790862821, - "narHash": "sha256-IcLn2hPlxsbn2PKVlFD6gsDzkVurQ7b0KPtyORUGFcs=", + "lastModified": 1792157233, + "narHash": "sha256-XQnyEc+Pj0Tg21ckbPMri0fiK/exCzhBw6wNgd1INqw=", "owner": "emmanuelrosa", "repo": "btc-clients-nix", - "rev": "99b0442dcc15198efcb62f3c1e7561a361749a6a", + "rev": "990d29e23437f30b8573f640d3e323167de1dc7b", "type": "github" }, "original": { @@ -26,11 +26,11 @@ ] }, "locked": { - "lastModified": 1788450739, - "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=", + "lastModified": 1790898470, + "narHash": "sha256-zTwuwezD0w3hpga6a6P8emidzAZFyWqlNeRBlpWOOl8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993", + "rev": "024633cd702b10285db5cb19b40ad48d2399ba60", "type": "github" }, "original": { @@ -41,11 +41,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1790861130, - "narHash": "sha256-cA8TrQntLbNO14wivJx7Gi2pZBhhBcMplgzIA3sk3TA=", + "lastModified": 1792155732, + "narHash": "sha256-3Dk56anLQ1V1VklQFKFD6ul3cKQk40sThurHlPHIhOo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3d23ea05a8a3be3f078845c2753af10cef80e1a5", + "rev": "7694c4f6b8537d50062ff36c21ef36de3c9322d7", "type": "github" }, "original": { @@ -56,11 +56,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1790750587, - "narHash": "sha256-VfjaoJ1Uyb7JZTrBgE5Jf2nhjtQPmD9KOd19HJwmZwM=", + "lastModified": 1792030654, + "narHash": "sha256-OaQwAtPMTjQiY2sT/2/62UbSPhzP/0aDnWzMm/NCiUw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "78e9c786dc08cd4f3420c2395cd977206a9b1da2", + "rev": "26f4107e47e3ad0ffd0db220469ba83b6f6d96e8", "type": "github" }, "original": { @@ -72,11 +72,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1790822859, - "narHash": "sha256-69xHQhAeMAD2wDXO7T2pcOZIF9Sga2W+JkmY2a11Ops=", + "lastModified": 1792094642, + "narHash": "sha256-zp8ToDMnqZcu4o4IH9pdwXFXGp7yLm/M0dEnNWnyd7I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa", + "rev": "fe13242281a67641c0102cdb1087f0ebe586c7df", "type": "github" }, "original": { @@ -88,11 +88,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1789724158, - "narHash": "sha256-nlKgrm0dsVhOSopKheVBCcOpiIticufPPVLdVOI0euA=", + "lastModified": 1791487292, + "narHash": "sha256-tqM7xDEsaeK1p6VvRygeZ9LkQRpUUkbRT02BHv6hnTM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0a3468a402c449992505b6a9fc5b06580141b750", + "rev": "8edc0c72e3a38faf5434e40d1f19431125fe4b30", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1790822859, - "narHash": "sha256-69xHQhAeMAD2wDXO7T2pcOZIF9Sga2W+JkmY2a11Ops=", + "lastModified": 1791956154, + "narHash": "sha256-jBYGPi4udQ9uo4KQp9m2J0546nJVQitG15gvZSaVVAs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa", + "rev": "55bfb4d7437bd4e09ab7cba58a43bd68eb310044", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1790541651, - "narHash": "sha256-/496IQz8qNWHHLnc3Zvr0l4uxJ34igNhJhn7ZKAefFk=", + "lastModified": 1792203519, + "narHash": "sha256-yJ072hxngo/srNdLTp4BlFeo0hedwnKicI3TGlSXLFE=", "owner": "nix-community", "repo": "nixvim", - "rev": "5980a626794486abad69fca7667f9c11dfbc3bd7", + "rev": "453dc9c5037e6d1bec81d2a51ddacd58a2f44e9c", "type": "github" }, "original": { @@ -152,11 +152,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1790877969, - "narHash": "sha256-Ia88keP9t3B6ECVw+LP4xasPdvzw1TIWya1K+3dySu0=", + "lastModified": 1792349245, + "narHash": "sha256-EVk00bSi11pzw3OyzGOsYpryQ/QbN/KDiMAbUMKuRIg=", "owner": "naturallaw777", "repo": "Sovran_Bitcoin", - "rev": "b0da63bd81f1a1b1a970068b3061c6c8389db9aa", + "rev": "50a8b76afab06ed7d4eeb38a1d0425432f388cbf", "type": "github" }, "original": { @@ -168,11 +168,11 @@ "systems": { "flake": false, "locked": { - "lastModified": 1774449309, - "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", + "lastModified": 1791244623, + "narHash": "sha256-uuanbkFk8a313Zfrxdcz8Us/yQtaxNnKJtX8v0ZPpd8=", "owner": "nix-systems", "repo": "default", - "rev": "c29398b59d2048c4ab79345812849c9bd15e9150", + "rev": "d36eeed142f88b5a636f2e3856a53c61654cf29b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 985b376..28cb09a 100644 --- a/flake.nix +++ b/flake.nix @@ -51,9 +51,9 @@ ]; config = { environment.systemPackages = with pkgs; [ - btc-clients.packages.${pkgs.system}.bisq - btc-clients.packages.${pkgs.system}.bisq2 - btc-clients.packages.${pkgs.system}.sparrow + btc-clients.packages.${pkgs.stdenv.hostPlatform.system}.bisq + btc-clients.packages.${pkgs.stdenv.hostPlatform.system}.bisq2 + btc-clients.packages.${pkgs.stdenv.hostPlatform.system}.sparrow ]; }; }; diff --git a/modules/sovran-bitcoin-integration.nix b/modules/sovran-bitcoin-integration.nix index 57a1da8..bc2b3fd 100644 --- a/modules/sovran-bitcoin-integration.nix +++ b/modules/sovran-bitcoin-integration.nix @@ -32,7 +32,7 @@ let NWC_LND_CERT_FILE = lndCertPath; NWC_LND_MACAROON_FILE = "/run/lnd/albyhub.macaroon"; NWC_RELAY = - if cfg.features.haven + if cfg.features.haven && config.networking.domain != null && config.networking.domain != "" then "wss://haven.${config.networking.domain}/nostr" else "wss://relay.getalby.com,wss://relay2.getalby.com"; };