diff --git a/flake.lock b/flake.lock index 23bd7ff..6336889 100644 --- a/flake.lock +++ b/flake.lock @@ -1,47 +1,5 @@ { "nodes": { - "extra-container": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1766155727, - "narHash": "sha256-XGp4HHH6D6ZKiO5RnMzqYJYnZB538EnEflvlTsOKpvo=", - "owner": "erikarvstedt", - "repo": "extra-container", - "rev": "b450bdb24fca1076973c852d87bcb49b8eb5fd49", - "type": "github" - }, - "original": { - "owner": "erikarvstedt", - "ref": "0.14", - "repo": "extra-container", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1786313170, @@ -58,60 +16,9 @@ "type": "github" } }, - "nixpkgs-25_05": { - "locked": { - "lastModified": 1767313136, - "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1786348146, - "narHash": "sha256-we5zDEFfn8TgzeWKjKDMIjeQZ59omEPl23NIF+13/ys=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d482ef84049d9b7276b83a06e4e4d76983830097", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { - "extra-container": "extra-container", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "nixpkgs-25_05": "nixpkgs-25_05", - "nixpkgs-unstable": "nixpkgs-unstable" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index bcc53b7..80a19a9 100644 --- a/flake.nix +++ b/flake.nix @@ -1,135 +1,27 @@ { description = '' - A collection of Nix packages and NixOS modules for easily - installing full-featured Bitcoin nodes with an emphasis on security. + NixOS modules for a Bitcoin node (bitcoind, lnd, electrs, mempool), + trimmed from fort-nix/nix-bitcoin. ''; - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - nixpkgs-25_05.url = "github:NixOS/nixpkgs/nixos-25.05"; - flake-utils.url = "github:numtide/flake-utils"; - extra-container = { - url = "github:erikarvstedt/extra-container/0.14"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; - }; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; - outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-25_05, flake-utils, ... }: + outputs = { self, nixpkgs }: let - supportedSystems = [ - "x86_64-linux" - "aarch64-linux" - # On these 32-bit platforms, Python pkg `pymemcache` 4.0.0 (required by - # `joinmarket`) is broken: - # "i686-linux" - # "armv7l-linux" - ]; - - test = import ./test/tests.nix nixpkgs.lib self.nixosModules.default; + supportedSystems = [ "x86_64-linux" "aarch64-linux" ]; + forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems + (system: f nixpkgs.legacyPackages.${system}); in { - lib = { - mkNbPkgs = { - system - , pkgs ? nixpkgs.legacyPackages.${system} - , pkgsUnstable ? nixpkgs-unstable.legacyPackages.${system} - , pkgs-25_05 ? nixpkgs-25_05.legacyPackages.${system} - }: - import ./pkgs { inherit pkgs pkgsUnstable pkgs-25_05; }; + nixosModules.default = ./modules/modules.nix; - test = { - inherit (test) scenarios; - }; + overlays.default = final: prev: import ./pkgs { pkgs = final; }; - inherit supportedSystems; - }; - - overlays.default = final: prev: let - nbPkgs = self.lib.mkNbPkgs { inherit (final) system; pkgs = final; }; - in removeAttrs nbPkgs [ "pinned" "nixops19_09" "krops" ]; - - nixosModules.default = { config, pkgs, lib, ... }: { - imports = [ ./modules/modules.nix ]; - - options = with lib; { - nix-bitcoin.useVersionLockedPkgs = mkOption { - type = types.bool; - default = false; - description = '' - Use the nixpkgs version locked by this flake for `nix-bitcoin.pkgs`. - Only relevant if you are using a nixpkgs version for evaluating your system - that differs from the one that is locked by this flake (via input `nixpkgs`). - If this is the case, enabling this option may result in a more stable system - because the nix-bitcoin services use the exact pkgs versions that are tested - by nix-bitcoin. - The downsides are increased evaluation times and increased system - closure size. - - If `false`, the default system pkgs are used. - ''; - }; - }; - - config = { - nix-bitcoin.pkgs = - if config.nix-bitcoin.useVersionLockedPkgs - then (self.lib.mkNbPkgs { inherit (config.nixpkgs) system; }).modulesPkgs - else (self.lib.mkNbPkgs { inherit (pkgs.stdenv.hostPlatform) system; inherit pkgs; }).modulesPkgs; - }; - }; - - templates.default = { - description = "Basic node template"; - path = ./examples/flakes; - }; - - } // (flake-utils.lib.eachSystem supportedSystems (system: - let - pkgs = nixpkgs.legacyPackages.${system}; - nbPkgs = self.lib.mkNbPkgs { inherit system pkgs; }; - in rec { - packages = flake-utils.lib.flattenTree (removeAttrs nbPkgs [ - "fetchNodeModules" - "krops" - "modulesPkgs" - "netns-exec" - "nixops19_09" - "pinned" - "generate-secrets" - "nbPython3Packages" - "nbPython3PackagesJoinmarket" - ]) // { - inherit (import ./examples/qemu-vm/minimal-vm.nix self pkgs system) - # A simple demo VM. - # See ./examples/flakes/flake.nix on how to use nix-bitcoin with flakes. - runVM - vm; - }; - - # Allow accessing the whole nested `nbPkgs` attrset (including `modulesPkgs`) - # via this flake. - # `packages` is not allowed to contain nested pkgs attrsets. - legacyPackages = - nbPkgs // - (test.pkgs self pkgs) // - { - extra-container = self.inputs.extra-container.packages.${system}.default; - - ciTestInfo = import ./test/ci/test-info.nix pkgs legacyPackages.instantiateTests; - }; - - apps = rec { - default = vm; - - # Run a basic nix-bitcoin node in a VM - vm = { - type = "app"; - program = toString packages.runVM; - }; - }; - - devShells.default = import ./dev/dev-env/dev-shell.nix pkgs; - } - )); + packages = forAllSystems (pkgs: { + inherit (import ./pkgs { inherit pkgs; }) + mempool-backend + mempool-frontend + mempool-rust-gbt + mempool-nginx-conf; + }); + }; } diff --git a/helper/update-flake.nix b/helper/update-flake.nix deleted file mode 100644 index e5fa20d..0000000 --- a/helper/update-flake.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ prevVersions ? null }: -let - flake = builtins.getFlake (toString ../.); - inherit (flake.inputs.nixpkgs) lib; -in rec { - # Convert the list of pinned pkgs to an attrset with form - # { - # stable = { bitcoind = "0.21.1"; ... }; - # unstable = { btcpayserver = "1.2.1"; ... }; - # } - # A pinned pkg is added to `stable` if its stable version is newer or - # identical to the unstable version. - versions = let - pinned = flake.legacyPackages.x86_64-linux.pinned; - pinnedPkgs = lib.filterAttrs (n: v: lib.isDerivation v) pinned; - stable = pinned.pkgs; - unstable = pinned.pkgsUnstable; - isStable = builtins.partition (pkgName: - !(unstable ? "${pkgName}") || - ((stable ? "${pkgName}") - && (builtins.compareVersions stable.${pkgName}.version unstable.${pkgName}.version >= 0)) - ) (builtins.attrNames pinnedPkgs); - in { - stable = lib.genAttrs isStable.right (pkgName: stable.${pkgName}.version); - unstable = lib.genAttrs isStable.wrong (pkgName: unstable.${pkgName}.version); - }; - - showUpdates = let - prev = builtins.fromJSON prevVersions; - prevPkgs = prev.stable // prev.unstable; - mapFilter = f: xs: lib.remove null (map f xs); - - mkChanges = title: pkgs: - let - lines = mapFilter (pkgName: - let - version = pkgs.${pkgName}; - prevVersion = prevPkgs.${pkgName}; - in - if version != prevVersion then - "${pkgName}: ${prevVersion} -> ${version}" - else - null - ) (builtins.attrNames pkgs); - in - if lines == [] then - null - else - builtins.concatStringsSep "\n" ([title] ++ lines); - - changes = [ - (mkChanges "Pkg updates in nixpkgs stable:" versions.stable) - (mkChanges "Pkg updates in nixpkgs unstable:" versions.unstable) - ]; - - allChanges = builtins.concatStringsSep "\n\n" (lib.remove null changes); - in - if allChanges == "" then - "No pkg version updates." - else - allChanges; - - pinnedFile = let - toLines = pkgs: builtins.concatStringsSep "\n " (builtins.attrNames pkgs); - in '' - # This file is generated by ../helper/update-flake.nix - pkgs: pkgsUnstable: pkgs-25_05: - { - inherit (pkgs) - ${toLines versions.stable}; - - inherit (pkgsUnstable) - ${toLines versions.unstable}; - - inherit pkgs pkgsUnstable pkgs-25_05; - } - ''; -} diff --git a/helper/update-flake.sh b/helper/update-flake.sh deleted file mode 100755 index cc5f976..0000000 --- a/helper/update-flake.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -# This script does the following: -# - When called without arguments, update all flake inputs, including nixpkgs. -# - When called with a version argument, set input `nixpkgs` in `flake.nix` to the -# specified version and only update this input. -# - Print version updates of pinned pkgs like so: -# Pkg updates in nixpkgs unstable: -# bitcoin: 0.20.0 -> 0.21.1 -# btcpayserver: 1.1.0 -> 1.1.2 -# - Write ../pkgs/pinned.nix: -# Packages for which the stable und unstable versions are identical are -# pinned to stable. -# All other pkgs are pinned to unstable. - -forceRun= -nixosVersion= -for arg in "$@"; do - case $arg in - -f) - forceRun=1 - ;; - *) - nixosVersion=$arg - ;; - esac -done - -# cd to script dir -cd "${BASH_SOURCE[0]%/*}" - -if [[ $(nix flake 2>&1) != *"requires a sub-command"* ]]; then - echo "Error. This script requires nix flake support." - echo "https://nixos.wiki/wiki/Flakes#Installing_flakes" - exit 1 -fi - -if [[ $forceRun ]] && ! git diff --quiet ../flake.{nix,lock}; then - echo "error: flake.nix/flake.lock have changes. Run with option -f to ignore." - exit 1 -fi - -if [[ ! $nixosVersion ]]; then - echo "Updating flake 'nixos-search'" - nix flake update --flake ../test/nixos-search - echo -fi - -versions=$(nix eval --json -f update-flake.nix versions) - -## Uncomment the following to generate a version change message for testing -# versions=$(echo "$versions" | sed 's|1|0|g') - -setVersion() { - sed -Ei "s|($1)[0-9.]+|\1$nixosVersion|" "$2" -} - -echo "Updating main flake" -if [[ $nixosVersion ]]; then - setVersion 'nixpkgs.url = .*?nixos-' ../flake.nix - setVersion 'system.stateVersion = "' ../examples/configuration.nix - setVersion 'nix-bitcoin.url = .*?/nixos-' ../examples/flakes/flake.nix - setVersion 'nix-bitcoin.url = .*?/nixos-' ../examples/container/flake.nix - setVersion 'update-flake.sh ' ../dev/README.md - nix flake update nixpkgs --flake .. -else - nix flake update --flake .. -fi - -echo -nix eval --raw -f update-flake.nix --argstr prevVersions "$versions" showUpdates; echo - -pinned=../pkgs/pinned.nix -pinnedSrc=$(nix eval --raw -f update-flake.nix --argstr prevVersions "$versions" pinnedFile) -if [[ $pinnedSrc != $(cat "$pinned") ]]; then - echo "$pinnedSrc" > "$pinned" - echo - echo "Updated pinned.nix" -fi diff --git a/modules/bitcoind.nix b/modules/bitcoind.nix index d0df9bd..77e04ce 100644 --- a/modules/bitcoind.nix +++ b/modules/bitcoind.nix @@ -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; ``` ''; }; diff --git a/modules/electrs.nix b/modules/electrs.nix index 0b8ff4f..592d492 100644 --- a/modules/electrs.nix +++ b/modules/electrs.nix @@ -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}' \ diff --git a/modules/lnd.nix b/modules/lnd.nix index 5111823..3e0a365 100644 --- a/modules/lnd.nix +++ b/modules/lnd.nix @@ -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; diff --git a/modules/nix-bitcoin.nix b/modules/nix-bitcoin.nix index 8b09f0a..74a2ee5 100644 --- a/modules/nix-bitcoin.nix +++ b/modules/nix-bitcoin.nix @@ -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: diff --git a/pkgs/default.nix b/pkgs/default.nix index 877e1ed..d339b31 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,21 +1,5 @@ -let - nixpkgsPinned = import ./nixpkgs-pinned.nix; -in -# Set default values for use without flakes -{ pkgs ? import { 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 { 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 diff --git a/pkgs/lndinit/default.nix b/pkgs/lndinit/default.nix deleted file mode 100644 index 932a542..0000000 --- a/pkgs/lndinit/default.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/lndinit/get-sha256.sh b/pkgs/lndinit/get-sha256.sh deleted file mode 100755 index 7b3d310..0000000 --- a/pkgs/lndinit/get-sha256.sh +++ /dev/null @@ -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 . diff --git a/pkgs/nixpkgs-pinned.nix b/pkgs/nixpkgs-pinned.nix deleted file mode 100644 index d5a865f..0000000 --- a/pkgs/nixpkgs-pinned.nix +++ /dev/null @@ -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; -} diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix deleted file mode 100644 index fba8096..0000000 --- a/pkgs/pinned.nix +++ /dev/null @@ -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; -} diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 07a6f2d..0000000 --- a/shell.nix +++ /dev/null @@ -1,12 +0,0 @@ -let - nixpkgs = (import ./pkgs/nixpkgs-pinned.nix).nixpkgs; -in -with import nixpkgs {}; - -stdenv.mkDerivation rec { - name = "nix-bitcoin-environment"; - - shellHook = '' - export NIX_PATH="nixpkgs=${nixpkgs}:nix-bitcoin=./:." - ''; -}