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
+1 -21
View File
@@ -1,21 +1,5 @@
let
nixpkgsPinned = import ./nixpkgs-pinned.nix;
in
# Set default values for use without flakes
{ pkgs ? import <nixpkgs> { config = {}; overlays = []; }
, pkgsUnstable ? import nixpkgsPinned.nixpkgs-unstable {
inherit (pkgs.stdenv.hostPlatform) system;
config = {};
overlays = [];
}
, pkgs-25_05 ? import nixpkgsPinned.nixpkgs-25_05 {
inherit (pkgs.stdenv.hostPlatform) system;
config = {};
overlays = [];
}
}:
{ pkgs ? import <nixpkgs> { config = {}; overlays = []; } }:
let self = {
lndinit = pkgs.callPackage ./lndinit { };
inherit (pkgs.callPackage ./mempool { inherit (self) fetchNodeModules; })
mempool-backend
mempool-frontend
@@ -23,8 +7,4 @@ let self = {
mempool-nginx-conf;
fetchNodeModules = pkgs.callPackage ./build-support/fetch-node-modules.nix { };
pinned = import ./pinned.nix pkgs pkgsUnstable pkgs-25_05;
modulesPkgs = self // self.pinned;
}; in self
-24
View File
@@ -1,24 +0,0 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "lndinit";
version = "0.1.3-beta";
src = fetchFromGitHub {
owner = "lightninglabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-sO1DpbppCurxr9g9nUl9Vx82FJK1mTcUw3rY1Fm1wEU=";
};
vendorHash = "sha256-El44BS5Bu0K/klMxkajciU/R6uqiXBMOiLN536QztbE=";
subPackages = [ "." ];
meta = with lib; {
description = "Wallet initializer utility for lnd";
homepage = "https://github.com/lightninglabs/lndinit";
license = licenses.mit;
maintainers = with maintainers; [ erikarvstedt ];
};
}
-26
View File
@@ -1,26 +0,0 @@
#!/usr/bin/env bash
set -euo pipefail
. "${BASH_SOURCE[0]%/*}/../../helper/run-in-nix-env" "git gnupg curl jq" "$@"
TMPDIR=$(mktemp -d -p /tmp)
trap 'rm -rf $TMPDIR' EXIT
cd "$TMPDIR"
echo "Fetching latest release"
repo=lightninglabs/lndinit
latest=$(curl -fsS "https://api.github.com/repos/$repo/releases/latest" | jq -r .tag_name)
echo "Latest release is $latest"
git clone --depth 1 --branch "$latest" https://github.com/lightninglabs/lndinit 2>/dev/null
cd lndinit
# GPG verification
export GNUPGHOME=$TMPDIR
echo "Fetching Oliver Gugger's key"
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys F4FC70F07310028424EFC20A8E4256593F177720 2> /dev/null
echo "Verifying latest release"
git verify-tag "$latest"
echo "tag: $latest"
git checkout -q "tags/$latest"
rm -rf .git
nix hash path .
-21
View File
@@ -1,21 +0,0 @@
let
fetchNixpkgs = { rev, sha256 }:
builtins.fetchTarball {
url = "https://github.com/nixos/nixpkgs/archive/${rev}.tar.gz";
inherit sha256;
};
fetch = input: let
inherit (input) locked;
in fetchNixpkgs {
inherit (locked) rev;
sha256 = locked.narHash;
};
lockedInputs = (builtins.fromJSON (builtins.readFile ../flake.lock)).nodes;
in
{
nixpkgs = fetch lockedInputs.nixpkgs;
nixpkgs-unstable = fetch lockedInputs.nixpkgs-unstable;
nixpkgs-25_05 = fetch lockedInputs.nixpkgs-25_05;
}
-24
View File
@@ -1,24 +0,0 @@
# This file is generated by ../helper/update-flake.nix
pkgs: pkgsUnstable: pkgs-25_05:
{
inherit (pkgs)
bitcoin
bitcoind
btcpayserver
charge-lnd
clightning
electrs
elementsd
extra-container
lightning-pool
lndconnect;
inherit (pkgsUnstable)
bitcoind-knots
clboss
fulcrum
lightning-loop
lnd;
inherit pkgs pkgsUnstable pkgs-25_05;
}