pleb/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: fix eval warnings for NixOS 25.11

Browse Source
This commit is contained in:
Erik Arvstedt
2025-12-23 10:45:43 +01:00
parent 4303550ce3
commit 54651163ba
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.nix
+1 -1
View File
@@ -73,7 +73,7 @@
nix-bitcoin.pkgs = nix-bitcoin.pkgs =
if config.nix-bitcoin.useVersionLockedPkgs if config.nix-bitcoin.useVersionLockedPkgs
then (self.lib.mkNbPkgs { inherit (config.nixpkgs) system; }).modulesPkgs then (self.lib.mkNbPkgs { inherit (config.nixpkgs) system; }).modulesPkgs
else (self.lib.mkNbPkgs { inherit (pkgs) system; inherit pkgs; }).modulesPkgs; else (self.lib.mkNbPkgs { inherit (pkgs.stdenv.hostPlatform) system; inherit pkgs; }).modulesPkgs;
}; };
}; };
modules/charge-lnd.nix
+1 -1
View File
@@ -75,7 +75,7 @@ let
group = user; group = user;
dataDir = "/var/lib/charge-lnd"; dataDir = "/var/lib/charge-lnd";
configFile = builtins.toFile "charge-lnd.config" cfg.policies; configFile = builtins.toFile "charge-lnd.config" cfg.policies;
checkedConfig = pkgs.runCommandNoCC "charge-lnd-checked.config" { } '' checkedConfig = pkgs.runCommand "charge-lnd-checked.config" { } ''
${config.nix-bitcoin.pkgs.charge-lnd}/bin/charge-lnd --check --config ${configFile} ${config.nix-bitcoin.pkgs.charge-lnd}/bin/charge-lnd --check --config ${configFile}
cp ${configFile} $out cp ${configFile} $out
''; '';
modules/lndconnect.nix
+1 -1
View File
@@ -124,7 +124,7 @@ let
# TODO-EXTERNAL: # TODO-EXTERNAL:
# lndconnect requires a --configfile argument, although it's unused # lndconnect requires a --configfile argument, although it's unused
# https://github.com/LN-Zap/lndconnect/issues/25 # https://github.com/LN-Zap/lndconnect/issues/25
pkgs.hiPrio (pkgs.writeScriptBin name '' lib.hiPrio (pkgs.writeScriptBin name ''
${shebang} ${shebang}
url=$( url=$(
${getExe config.nix-bitcoin.pkgs.lndconnect} --url \ ${getExe config.nix-bitcoin.pkgs.lndconnect} --url \
modules/netns-isolation.nix
+1 -1
View File
@@ -157,7 +157,7 @@ in {
veth = "nb-veth-${toString v.id}"; veth = "nb-veth-${toString v.id}";
peer = "nb-veth-br-${toString v.id}"; peer = "nb-veth-br-${toString v.id}";
inherit (v) netnsName; inherit (v) netnsName;
nsenter = "${pkgs.utillinux}/bin/nsenter"; nsenter = "${pkgs.util-linux}/bin/nsenter";
allowedNetnsAddresses = map (available: netns.${available}.address) v.availableNetns; allowedNetnsAddresses = map (available: netns.${available}.address) v.availableNetns;
allowedAddresses = concatStringsSep "," allowedAddresses = concatStringsSep ","
([ "127.0.0.1,${bridgeIp},${v.address}" ] ++ allowedNetnsAddresses); ([ "127.0.0.1,${bridgeIp},${v.address}" ] ++ allowedNetnsAddresses);
pkgs/default.nix
+2 -2
View File
@@ -4,14 +4,14 @@ in
# Set default values for use without flakes # Set default values for use without flakes
{ pkgs ? import <nixpkgs> { config = {}; overlays = []; } { pkgs ? import <nixpkgs> { config = {}; overlays = []; }
, pkgsUnstable ? import nixpkgsPinned.nixpkgs-unstable { , pkgsUnstable ? import nixpkgsPinned.nixpkgs-unstable {
inherit (pkgs.stdenv) system; inherit (pkgs.stdenv.hostPlatform) system;
config = {}; config = {};
overlays = []; overlays = [];
} }
}: }:
let self = { let self = {
clightning-rest = pkgs.callPackage ./clightning-rest { inherit (self) fetchNodeModules; }; clightning-rest = pkgs.callPackage ./clightning-rest { inherit (self) fetchNodeModules; };
clightning-plugins = pkgs.recurseIntoAttrs (import ./clightning-plugins pkgs self.nbPython3Packages); clightning-plugins = pkgs.lib.recurseIntoAttrs (import ./clightning-plugins pkgs self.nbPython3Packages);
clnrest = pkgs.callPackage ./clnrest { inherit (self.pinned) clightning; }; clnrest = pkgs.callPackage ./clnrest { inherit (self.pinned) clightning; };
joinmarket = pkgs.callPackage ./joinmarket { inherit (self) nbPython3PackagesJoinmarket; }; joinmarket = pkgs.callPackage ./joinmarket { inherit (self) nbPython3PackagesJoinmarket; };
lndinit = pkgs.callPackage ./lndinit { }; lndinit = pkgs.callPackage ./lndinit { };