fort-nix/nix-bitcoin
1
1
Fork 0
mirror of https://github.com/fort-nix/nix-bitcoin.git synced 2024-10-03 18:57:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
b26cea03b3 update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK b26cea03b3

Tree-SHA512: 1c947307f0e89c89b931ee2c66675544a0fd37d878bf80acc940bdd023d2f0576b0b02a098ed36fe93bb334b877027f22077e3039fe8a609c2230a53e860fd17
This commit is contained in:
Jonas Nick 2024-07-03 19:43:47 +00:00
commit 652b67ed94
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
10 changed files with 88 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/deploy-container-minimal.sh
View File

@ -21,7 +21,13 @@ cat > "$tmpDir/configuration.nix" <<EOF
password = "a";
};
# When WAN is disabled, DNS bootstrapping slows down service startup by ~15 s
services.clightning.extraConfig = "disable-dns";
# TODO-EXTERNAL:
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
services.clightning.extraConfig = ''
disable-dns
disable-plugin=offers
'';
}
EOF

7
examples/deploy-container.sh
View File

@ -83,6 +83,13 @@ read -rd '' src <<EOF || true
$(realpath "$configuration")
];
nix-bitcoin.generateSecrets = true;
# TODO-EXTERNAL:
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
services.clightning.extraConfig = ''
disable-plugin=offers
'';
};
};
}

7
examples/deploy-qemu-vm.sh
View File

@ -30,6 +30,13 @@ nix-build --out-link "$tmpDir/vm" - <<'EOF'
<qemu-vm/vm-config.nix>
];
nix-bitcoin.generateSecrets = true;
# TODO-EXTERNAL:
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
services.clightning.extraConfig = ''
disable-plugin=offers
'';
};
}).config.system.build.vm
EOF

7
examples/krops-vm-configuration.nix
View File

@ -4,4 +4,11 @@
<nix-bitcoin/modules/deployment/krops.nix>
<qemu-vm/vm-config.nix>
];
# TODO-EXTERNAL:
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
services.clightning.extraConfig = ''
disable-plugin=offers
'';
}

10
examples/qemu-vm/minimal-vm.nix
View File

@ -26,8 +26,14 @@ rec {
nix-bitcoin.generateSecrets = true;
services.clightning.enable = true;
# For faster startup in offline VMs
services.clightning.extraConfig = "disable-dns";
# disable-dns leads to faster startup in offline VMs
# TODO-EXTERNAL:
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
services.clightning.extraConfig = ''
disable-dns
disable-plugin=offers
'';
# Avoid lengthy build of the nixos manual
documentation.nixos.enable = false;

12
flake.lock
View File

@ -43,11 +43,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1716361217,
"narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=",
"lastModified": 1719663039,
"narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f",
"rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119",
"type": "github"
},
"original": {
@ -59,11 +59,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1716451822,
"narHash": "sha256-0lT5RVelqN+dgXWWneXvV5ufSksW0r0TDQi8O6U2+o8=",
"lastModified": 1719468428,
"narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3305b2b25e4ae4baee872346eae133cf6f611783",
"rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d",
"type": "github"
},
"original": {

8
test/clightning-replication.nix
View File

@ -24,7 +24,13 @@ let
# TODO-EXTERNAL:
# When WAN is disabled, DNS bootstrapping slows down service startup by ~15 s.
extraConfig = "disable-dns";
# TODO-EXTERNAL:
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
extraConfig = ''
disable-dns
disable-plugin=offers
'';
};
};
in

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

@ -21,11 +21,11 @@
"nixos-infra": {
"flake": false,
"locked": {
"lastModified": 1714782417,
"narHash": "sha256-AhnsgqwOvK7Ftv1Sw9uzJGxov0cx9ygSjcKQSAWbiPg=",
"lastModified": 1719512984,
"narHash": "sha256-Mp16JvE5A9RxMh1vFuwUroInbzM0ZZZ+x/GFVQYt6PQ=",
"owner": "NixOS",
"repo": "infra",
"rev": "0b39213973d7a4bab9f710dadb8ea1b14d206627",
"rev": "8ff24cb2648f7f08749d5891aa9b0bacb638fe84",
"type": "github"
},
"original": {
@ -39,14 +39,15 @@
"flake-utils": "flake-utils",
"nixos-infra": "nixos-infra",
"nixpkgs": "nixpkgs",
"nixpkgs-npmlock2nix": "nixpkgs-npmlock2nix",
"npmlock2nix": "npmlock2nix"
},
"locked": {
"lastModified": 1715356306,
"narHash": "sha256-PRGw/1gCYDsLVXFwSGfOWe9vJhiQ7lE0XHpKXLDcsRw=",
"lastModified": 1719737420,
"narHash": "sha256-X+DK41RO/vxUBMyCJfWMVBxVDuPHkZskZK03knNoeTk=",
"owner": "nixos",
"repo": "nixos-search",
"rev": "1242aebd1438548fa1e3699824599337cce4cd32",
"rev": "69a9eab2525e49be3f331e8570efef126cff4a1f",
"type": "github"
},
"original": {
@ -57,11 +58,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1714635257,
"narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=",
"lastModified": 1719506693,
"narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f",
"rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a",
"type": "github"
},
"original": {
@ -70,6 +71,21 @@
"type": "indirect"
}
},
"nixpkgs-npmlock2nix": {
"locked": {
"lastModified": 1636623366,
"narHash": "sha256-jOQMlv9qFSj0U66HB+ujZoapty0UbewmSNbX8+3ujUQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c5ed8beb478a8ca035f033f659b60c89500a3034",
"type": "github"
},
"original": {
"id": "nixpkgs",
"rev": "c5ed8beb478a8ca035f033f659b60c89500a3034",
"type": "indirect"
}
},
"npmlock2nix": {
"flake": false,
"locked": {

8
test/tests.nix
View File

@ -43,7 +43,13 @@ let
# TODO-EXTERNAL:
# When WAN is disabled, DNS bootstrapping slows down service startup by ~15 s.
services.clightning.extraConfig = mkIf config.test.noConnections "disable-dns";
# TODO-EXTERNAL:
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
services.clightning.extraConfig = ''
${optionalString config.test.noConnections "disable-dns"}
disable-plugin=offers
'';
test.data.clightning-plugins = let
plugins = config.services.clightning.plugins;
removed = [

8
test/wireguard-lndconnect.nix
View File

@ -24,7 +24,13 @@ makeTestVM {
};
# TODO-EXTERNAL:
# When WAN is disabled, DNS bootstrapping slows down service startup by ~15 s.
services.clightning.extraConfig = "disable-dns";
# TODO-EXTERNAL:
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
services.clightning.extraConfig = ''
disable-dns
disable-plugin=offers
'';
services.lnd = {
enable = true;