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

Merge fort-nix/nix-bitcoin#840: update nixpkgs

Browse Source 
955b7d0718 update nbxplorer (Jonas Nick)
f9a0e469d5 update nixpkgs (Jonas Nick)
4c22a3c594 update nixpkgs (Jonas Nick)

Pull request description:

Top commit has no ACKs.

Tree-SHA512: a857687e5c667f29b66e2bcdbd244722ad3cc7e433b18071153ae958006b7646b261fbc0b9331ac8b92f9a9d22562a0705a33a7444f9ffd2ccbc4e9d65e8494f
This commit is contained in:
Jonas Nick
2026-05-12 16:34:57 +00:00
parent c4891858da 955b7d0718
commit 407796c767
8 changed files with 66 additions and 1114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+9 -9
View File
@@ -44,11 +44,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1767480499,
"narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=",
"lastModified": 1777673416,
"narHash": "sha256-5c2POKPOjU40Kh0MirOdScBLG0bu9TAuPYAtPRNZMBs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92",
"rev": "26ef669cffa904b6f6832ab57b77892a37c1a671",
"type": "github"
},
"original": {
@@ -60,11 +60,11 @@
},
"nixpkgs-25_05": {
"locked": {
"lastModified": 1767051569,
"narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=",
"lastModified": 1767313136,
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd",
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
"type": "github"
},
"original": {
@@ -76,11 +76,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1767364772,
"narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
"lastModified": 1777826146,
"narHash": "sha256-wQ/iN5Zp5VIa3ebBibijPnLyKhor+xEbDy4d0goa9Zs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
"rev": "73c703c22422b8951895a960959dbbaca7296492",
"type": "github"
},
"original": {
modules/lightning-pool.nix
+2
View File
@@ -99,6 +99,8 @@ in {
ln -sfn ${configFile} '${cfg.dataDir}/${network}/poold.conf'
'';
serviceConfig = nbLib.defaultHardening // {
# TODO: temporary sleep to prevent race condition
ExecStartPre = "${pkgs.coreutils}/bin/sleep 5";
ExecStart = "${cfg.package}/bin/poold --basedir='${cfg.dataDir}' --network=${network}";
User = "lnd";
Restart = "on-failure";
pkgs/clnrest/default.nix
+1 -1
View File
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
inherit (clightning) src;
cargoHash = "sha256-2xOLwj42Ua85+kn73y+5q3YmzKYMCjxLlq/UrYjiZv0=";
cargoHash = "sha256-0rpr941QkDeNLQ6Se9+DbbVBCmGyU721a27XNzylpPw=";
depsExtraArgs = {
nativeBuildInputs = [ unzip ];
pkgs/nbxplorer/default.nix
+4 -5
View File
@@ -4,23 +4,22 @@
fetchFromGitHub,
dotnetCorePackages,
}:
buildDotnetModule rec {
pname = "nbxplorer";
version = "2.5.26";
version = "2.6.7";
src = fetchFromGitHub {
owner = "dgarage";
repo = "NBXplorer";
tag = "v${version}";
hash = "sha256-gXLzUgFZxrDNbDjpPmVDIj2xi6I+IfkNwXBYvelRYPU=";
hash = "sha256-fA8Gv0Qc/+a8trLchXsawNk/4AdWjJCnzrwd8+rrJbw=";
};
projectFile = "NBXplorer/NBXplorer.csproj";
nugetDeps = ./deps.json;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
dotnet-sdk = dotnetCorePackages.sdk_10_0;
dotnet-runtime = dotnetCorePackages.aspnetcore_10_0;
# macOS has a case-insensitive filesystem, so these two can be the same file
postFixup = ''
pkgs/nbxplorer/deps.json
+22 -1072
View File
File diff suppressed because it is too large Load Diff
pkgs/pinned.nix
+7 -8
View File
@@ -4,22 +4,21 @@ pkgs: pkgsUnstable: pkgs-25_05:
inherit (pkgs)
bitcoin
bitcoind
bitcoind-knots
btcpayserver
charge-lnd
clboss
clightning
electrs
elementsd
extra-container
fulcrum
lightning-loop
lightning-pool
lnd
lndconnect;
inherit (pkgsUnstable)
;
bitcoind-knots
btcpayserver
clboss
clightning
elementsd
lightning-loop
lnd;
inherit pkgs pkgsUnstable pkgs-25_05;
}
pkgs/python-packages/default.nix
+9 -7
View File
@@ -59,13 +59,15 @@ rec {
in {
hwi = with python3PackagesWithUnlockedEcdsa; toPythonApplication hwi;
# trezor 0.13.10 supports click 8.2.x.
# The version spec `click>=8,<8.3` has been copied from trezor 0.20.0-dev.
trezor = python3PackagesWithUnlockedEcdsa.trezor.overridePythonAttrs (_: {
postPatch = ''
substituteInPlace requirements.txt \
--replace-fail 'click>=7,<8.2' 'click>=8,<8.3'
'';
# nixpkgs has keyring 25.6.0, but trezor 0.20.0 requires >= 25.7.0.
# 25.7.0 only adds KWallet 6 support and removes Python 3.8 cruft,
# so 25.6.0 is functionally equivalent for trezor's use.
# Relax the constraint until nixpkgs updates keyring.
trezor = python3PackagesWithUnlockedEcdsa.trezor.overridePythonAttrs (old: {
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [
python3PackagesWithUnlockedEcdsa.pythonRelaxDepsHook
];
pythonRelaxDeps = [ "keyring" ];
});
};
}
test/nixos-search/flake.lock
Generated
+12 -12
View File
@@ -21,11 +21,11 @@
"nixos-infra": {
"flake": false,
"locked": {
"lastModified": 1767225854,
"narHash": "sha256-RESYvk2PXt6SkYG6UnPSlMcSEAQpabiKha1lkv/NtT4=",
"lastModified": 1777369279,
"narHash": "sha256-ewYONJDiRt9Vc2Ar6SKyiQ0zBUSz3ws2HY9lU2NEiXM=",
"owner": "NixOS",
"repo": "infra",
"rev": "cfa5982b9961fccd252ff550213a0eb00c77f6f8",
"rev": "5ecd8f26fc30311913f1c19b29a4d8853e28123a",
"type": "github"
},
"original": {
@@ -44,11 +44,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1767372151,
"narHash": "sha256-JOQu3GRk3hWsJilqJ8XgKKD2BHvve3FTfzDYxJV9Btc=",
"lastModified": 1777878641,
"narHash": "sha256-saijRTtAhxOe9ZiaPbJOCWgfnlNzksLQBK00gf7OOcg=",
"owner": "nixos",
"repo": "nixos-search",
"rev": "9bce76e857f6874ede35d1065c39da42b1a70e2a",
"rev": "e9806088e52087ea6414bf4a447b345a81e03a32",
"type": "github"
},
"original": {
@@ -59,11 +59,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1765472234,
"narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
"lastModified": 1777268161,
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
"type": "github"
},
"original": {
@@ -131,11 +131,11 @@
]
},
"locked": {
"lastModified": 1762938485,
"narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=",
"lastModified": 1775636079,
"narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4",
"rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
"type": "github"
},
"original": {