From aae4b6bfc5946b375b47610b70d8447d95e7f11c Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Fri, 6 Jan 2023 22:53:47 +0000 Subject: [PATCH 1/2] update nixpkgs btcpayserver: 1.7.1 -> 1.7.2 fulcrum: 1.8.2 -> 1.9.0 nbxplorer: 2.3.49 -> 2.3.54 --- flake.lock | 18 +++++++++--------- pkgs/pinned.nix | 2 +- test/nixos-search/flake.lock | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index ceb8414..e3556ef 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1667229260, - "narHash": "sha256-+J7woVK3pnMwHvJSrB0kYKWqEB4yYDqBcFFg8IhIFhw=", + "lastModified": 1671802034, + "narHash": "sha256-mkv2u5nQJEV3KlWiopkt/gMz0OM4nmEXSfzkSw6welQ=", "owner": "erikarvstedt", "repo": "extra-container", - "rev": "3fce6c52bad520110c570c8ec5f02e2e6b93ce68", + "rev": "e34f0cca15f6f0f2e598dad0b329196d0dab6d4f", "type": "github" }, "original": { @@ -40,11 +40,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1671040593, - "narHash": "sha256-W5aZNwYBjaEaLifDWGEfecvnCiDkXjI26rHgidSftUM=", + "lastModified": 1672844754, + "narHash": "sha256-o26WabuHABQsaHxxmIrR3AQRqDFUEdLckLXkVCpIjSU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "170e39462b516bd1475ce9184f7bb93106d27c59", + "rev": "e9ade2c8240e00a4784fac282a502efff2786bdc", "type": "github" }, "original": { @@ -56,11 +56,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1671095104, - "narHash": "sha256-BgI8tDJgORrKX9lF93enEDKP5WxIoVBt9+1zoGIfx7k=", + "lastModified": 1672756850, + "narHash": "sha256-Smbq3+fitwA13qsTMeaaurv09/KVbZfW7m7lINwzDGA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7634c3250b6870e76f2e611cb95b72392add9aef", + "rev": "298add347c2bbce14020fcb54051f517c391196b", "type": "github" }, "original": { diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix index 859d07f..5e660de 100644 --- a/pkgs/pinned.nix +++ b/pkgs/pinned.nix @@ -8,7 +8,6 @@ pkgs: pkgsUnstable: electrs elementsd extra-container - fulcrum hwi lightning-loop lightning-pool @@ -18,6 +17,7 @@ pkgs: pkgsUnstable: inherit (pkgsUnstable) charge-lnd clightning + fulcrum lnd; inherit pkgs pkgsUnstable; diff --git a/test/nixos-search/flake.lock b/test/nixos-search/flake.lock index c0dc972..1b76cbe 100644 --- a/test/nixos-search/flake.lock +++ b/test/nixos-search/flake.lock @@ -39,11 +39,11 @@ "npmlock2nix": "npmlock2nix" }, "locked": { - "lastModified": 1670367531, - "narHash": "sha256-ArMS2vkvfym5SZC2bBfOdr4ZX+8PepH07PsU2KpiytY=", + "lastModified": 1673019806, + "narHash": "sha256-iZousPg/4eDv2c9MTRo9RP8jjjp7luP7JYWU71MXCds=", "owner": "nixos", "repo": "nixos-search", - "rev": "4bea45b15019ad6f2187c5fa0142b27e06586e36", + "rev": "1d9fac3a575623c79c1f56c771360b049888447b", "type": "github" }, "original": { From 9019a17bfc3b72f79f8d0336d961e0e28d682b62 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sat, 7 Jan 2023 11:11:42 +0100 Subject: [PATCH 2/2] versioning: add fulcrum db change info --- examples/configuration.nix | 2 +- modules/versioning.nix | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/examples/configuration.nix b/examples/configuration.nix index ff781af..0305b1c 100644 --- a/examples/configuration.nix +++ b/examples/configuration.nix @@ -292,5 +292,5 @@ # The nix-bitcoin release version that your config is compatible with. # When upgrading to a backwards-incompatible release, nix-bitcoin will display an # an error and provide instructions for migrating your config to the new release. - nix-bitcoin.configVersion = "0.0.70"; + nix-bitcoin.configVersion = "0.0.85"; } diff --git a/modules/versioning.nix b/modules/versioning.nix index 3a53265..8254132 100644 --- a/modules/versioning.nix +++ b/modules/versioning.nix @@ -231,6 +231,15 @@ let The `lndconnect-rest-onion` binary has been renamed to `lndconnect-onion`. ''; } + { + version = "0.0.85"; + condition = config.services.fulcrum.enable; + message = '' + Fulcrum 1.9.0 has changed its database format. + The database update happens automatically and instantly on deployment, + but you can't switch back to an older Fulcrum version afterwards. + ''; + } ]; mkOnionServiceChange = service: {