greg
/
nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge fort-nix/nix-bitcoin#582: update nixpkgs 

9019a17bfc versioning: add fulcrum db change info (Erik Arvstedt)
aae4b6bfc5 update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 9019a17bfc

Tree-SHA512: d1620431beca7841d0e16deedef2c77364db1d7d2f8edf61cdf4ee2d2f8759736acf64fe9764bef0687a283e6d4eb45e4533e92fa1db601a0f2b331182135e10
This commit is contained in:
Jonas Nick 2023-01-08 10:57:00 +00:00
parent da612fe84f 9019a17bfc
commit dfeff7b17b
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
5 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/configuration.nix
View File

@ -292,5 +292,5 @@
# The nix-bitcoin release version that your config is compatible with. # The nix-bitcoin release version that your config is compatible with.
# When upgrading to a backwards-incompatible release, nix-bitcoin will display an # 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. # 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";
} }

18
flake.lock
View File

@ -10,11 +10,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1667229260, "lastModified": 1671802034,
"narHash": "sha256-+J7woVK3pnMwHvJSrB0kYKWqEB4yYDqBcFFg8IhIFhw=", "narHash": "sha256-mkv2u5nQJEV3KlWiopkt/gMz0OM4nmEXSfzkSw6welQ=",
"owner": "erikarvstedt", "owner": "erikarvstedt",
"repo": "extra-container", "repo": "extra-container",
"rev": "3fce6c52bad520110c570c8ec5f02e2e6b93ce68", "rev": "e34f0cca15f6f0f2e598dad0b329196d0dab6d4f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -40,11 +40,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1671040593, "lastModified": 1672844754,
"narHash": "sha256-W5aZNwYBjaEaLifDWGEfecvnCiDkXjI26rHgidSftUM=", "narHash": "sha256-o26WabuHABQsaHxxmIrR3AQRqDFUEdLckLXkVCpIjSU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "170e39462b516bd1475ce9184f7bb93106d27c59", "rev": "e9ade2c8240e00a4784fac282a502efff2786bdc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -56,11 +56,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1671095104, "lastModified": 1672756850,
"narHash": "sha256-BgI8tDJgORrKX9lF93enEDKP5WxIoVBt9+1zoGIfx7k=", "narHash": "sha256-Smbq3+fitwA13qsTMeaaurv09/KVbZfW7m7lINwzDGA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7634c3250b6870e76f2e611cb95b72392add9aef", "rev": "298add347c2bbce14020fcb54051f517c391196b",
"type": "github" "type": "github"
}, },
"original": { "original": {

9
modules/versioning.nix
View File

@ -231,6 +231,15 @@ let
The `lndconnect-rest-onion` binary has been renamed to `lndconnect-onion`. 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: { mkOnionServiceChange = service: {

2
pkgs/pinned.nix
View File

@ -8,7 +8,6 @@ pkgs: pkgsUnstable:
electrs electrs
elementsd elementsd
extra-container extra-container
fulcrum
hwi hwi
lightning-loop lightning-loop
lightning-pool lightning-pool
@ -18,6 +17,7 @@ pkgs: pkgsUnstable:
inherit (pkgsUnstable) inherit (pkgsUnstable)
charge-lnd charge-lnd
clightning clightning
fulcrum
lnd; lnd;
inherit pkgs pkgsUnstable; inherit pkgs pkgsUnstable;

6
test/nixos-search/flake.lock
View File

@ -39,11 +39,11 @@
"npmlock2nix": "npmlock2nix" "npmlock2nix": "npmlock2nix"
}, },
"locked": { "locked": {
"lastModified": 1670367531, "lastModified": 1673019806,
"narHash": "sha256-ArMS2vkvfym5SZC2bBfOdr4ZX+8PepH07PsU2KpiytY=", "narHash": "sha256-iZousPg/4eDv2c9MTRo9RP8jjjp7luP7JYWU71MXCds=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-search", "repo": "nixos-search",
"rev": "4bea45b15019ad6f2187c5fa0142b27e06586e36", "rev": "1d9fac3a575623c79c1f56c771360b049888447b",
"type": "github" "type": "github"
}, },
"original": { "original": {