Drop pinned nixpkgs inputs and the local lndinit

Take every package from the consumer's pkgs: bitcoind, lnd, electrs and
lndinit (0.1.3 -> nixpkgs' version; gen-seed and init-wallet flags are
unchanged). The flake now has a single nixpkgs input. Removes
useVersionLockedPkgs, pinned.nix, nixpkgs-pinned.nix, shell.nix and the
update-flake helper that generated pinned.nix.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
pleb
2026-11-15 19:45:22 -08:00
co-authored by Claude Opus 5.5
parent 0b8304395b
commit 5d7289532b
14 changed files with 28 additions and 514 deletions
+3 -3
View File
@@ -57,15 +57,15 @@ let
};
package = mkOption {
type = types.package;
default = config.nix-bitcoin.pkgs.bitcoind;
defaultText = "config.nix-bitcoin.pkgs.bitcoind";
default = pkgs.bitcoind;
defaultText = lib.literalExpression "pkgs.bitcoind";
description = ''
The package providing bitcoind binaries.
You can use this option to select other bitcoind-compatible implementations.
Example:
```nix
services.bitcoind.package = config.nix-bitcoin.pkgs.bitcoind-knots;
services.bitcoind.package = pkgs.bitcoind-knots;
```
'';
};
+1 -1
View File
@@ -77,7 +77,7 @@ in {
# electrs only uses the working directory for reading electrs.toml
WorkingDirectory = cfg.dataDir;
ExecStart = ''
${config.nix-bitcoin.pkgs.electrs}/bin/electrs \
${pkgs.electrs}/bin/electrs \
--log-filters=INFO \
--network=${bitcoind.makeNetworkName "bitcoin" "regtest"} \
--db-dir='${cfg.dataDir}' \
+3 -3
View File
@@ -104,8 +104,8 @@ let
};
package = mkOption {
type = types.package;
default = config.nix-bitcoin.pkgs.lnd;
defaultText = "config.nix-bitcoin.pkgs.lnd";
default = pkgs.lnd;
defaultText = lib.literalExpression "pkgs.lnd";
description = "The package providing lnd binaries.";
};
cli = mkOption {
@@ -150,7 +150,7 @@ let
nbLib = config.nix-bitcoin.lib;
secretsDir = config.nix-bitcoin.secretsDir;
runAsUser = config.nix-bitcoin.runAsUserCmd;
lndinit = "${config.nix-bitcoin.pkgs.lndinit}/bin/lndinit";
lndinit = "${pkgs.lndinit}/bin/lndinit";
bitcoind = config.services.bitcoind;
+2 -2
View File
@@ -6,8 +6,8 @@ with lib;
nix-bitcoin = {
pkgs = mkOption {
type = types.attrs;
default = (import ../pkgs { inherit pkgs; }).modulesPkgs;
defaultText = "nix-bitcoin/pkgs.modulesPkgs";
default = import ../pkgs { inherit pkgs; };
defaultText = "nix-bitcoin/pkgs";
apply = base:
let
final = foldl (prev: overlay: