Sovran_Systems/Sovran_SystemsOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Restore upstream nix-bitcoin fetchNodeModules for mempool and RTL packages

Browse Source 
Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-08-10 23:24:31 +00:00
committed by GitHub
co-authored by naturallaw777
parent 7879a2771d
commit c2dce6cf94
5 changed files with 240 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/bitcoin/mempool.nix
+4 -3
View File
@@ -66,7 +66,7 @@ let
};
staticContentRoot = mkOption {
type = types.path;
default = (pkgs.callPackage ../../packages/mempool {}).mempool-frontend.withConfig cfg.frontend.settings;
default = (pkgs.callPackage ../../packages/mempool { fetchNodeModules = pkgs.callPackage ../../packages/build-support/fetch-node-modules.nix {}; }).mempool-frontend.withConfig cfg.frontend.settings;
defaultText = "mempoolPkgs.mempool-frontend";
description = "
Path of the static frontend content root.
@@ -131,7 +131,7 @@ let
};
package = mkOption {
type = types.package;
default = (pkgs.callPackage ../../packages/mempool {}).mempool-backend;
default = (pkgs.callPackage ../../packages/mempool { fetchNodeModules = pkgs.callPackage ../../packages/build-support/fetch-node-modules.nix {}; }).mempool-backend;
defaultText = "mempoolPkgs.mempool-backend";
description = "The package providing mempool binaries.";
};
@@ -172,7 +172,8 @@ let
torSocket = config.services.tor.client.socksListenAddress;
# Vendored mempool package
mempoolPkgs = pkgs.callPackage ../../packages/mempool {};
fetchNodeModules = pkgs.callPackage ../../packages/build-support/fetch-node-modules.nix {};
mempoolPkgs = pkgs.callPackage ../../packages/mempool { inherit fetchNodeModules; };
# See the `services.nginx` definition further below
# on how to use these snippets.
modules/bitcoin/rtl.nix
+2 -1
View File
@@ -81,7 +81,8 @@ let
secretsDir = config.nix-bitcoin.secretsDir;
# Vendored RTL package
rtlPackage = pkgs.callPackage ../../packages/rtl {};
fetchNodeModules = pkgs.callPackage ../../packages/build-support/fetch-node-modules.nix {};
rtlPackage = pkgs.callPackage ../../packages/rtl { inherit fetchNodeModules; };
runePath = "${cfg.dataDir}/CLN-Rune.env";