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

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

Browse source 
14d0b33d20 update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 14d0b33d20

Tree-SHA512: c055e49ed5132510e97209965fea0c8fc9638de5b8099adedfd9e325cfc142b30dfd43ed50a669e7f204faca361c40f8304c5783810ae2f38d042fef256d48a5
This commit is contained in:
Jonas Nick 2025-10-07 12:15:11 +00:00
commit dedbacf35e
No known key found for this signature in database
GPG key ID: 4861DBF262123605
7 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.lock generated
View file

@ -44,11 +44,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1757545623,
"narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=",
"lastModified": 1759735786,
"narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526",
"rev": "20c4598c84a671783f741e02bf05cbfaf4907cff",
"type": "github"
},
"original": {
@ -60,11 +60,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1757584362,
"narHash": "sha256-XeTX/w16rUNUNBsfaOVCDoMMa7Xu7KvIMT7tn1zIEcg=",
"lastModified": 1759632233,
"narHash": "sha256-krgZxGAIIIKFJS+UB0l8do3sYUDWJc75M72tepmVMzE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d33e926c80e6521a55da380a4c4c44a7462af405",
"rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10",
"type": "github"
},
"original": {

2
pkgs/clnrest/default.nix
View file

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
inherit (clightning) src;
cargoHash = "sha256-HxFfiFlILv8OOHn6Yt5cC41Gw0eya4uCAwXdK83X1bQ=";
cargoHash = "sha256-UxMXBO/rpanNU8vz8y4V5wSbCNHKYmVXtoGRpOqI+A0=";
depsExtraArgs = {
nativeBuildInputs = [ unzip ];

4
pkgs/pinned.nix
View file

@ -2,8 +2,6 @@
pkgs: pkgsUnstable:
{
inherit (pkgs)
bitcoind-knots
charge-lnd
clboss
elementsd
extra-container
@ -15,7 +13,9 @@ pkgs: pkgsUnstable:
inherit (pkgsUnstable)
bitcoin
bitcoind
bitcoind-knots
btcpayserver
charge-lnd
clightning
electrs
lightning-loop

8
pkgs/python-packages/pyln-bolt7/default.nix
View file

@ -1,17 +1,19 @@
{ buildPythonPackage, poetry-core, pytestCheckHook, clightning, pyln-proto }:
{ buildPythonPackage, hatchling, pytestCheckHook, clightning, pyln-proto }:
buildPythonPackage rec {
pname = "pyln-bolt7";
# The version is defined here:
# https://github.com/ElementsProject/lightning/blob/master/contrib/pyln-spec/bolt7/pyproject.toml
version = "1.0.2.186.post0";
version = "1.0.4.246";
format = "pyproject";
inherit (clightning) src;
nativeBuildInputs = [ poetry-core ];
nativeBuildInputs = [ hatchling ];
propagatedBuildInputs = [ pyln-proto ];
checkInputs = [ pytestCheckHook ];
pythonNamespaces = [ "pyln" ];
postUnpack = "sourceRoot=$sourceRoot/contrib/pyln-spec/bolt7";
}

6
pkgs/python-packages/pyln-client/default.nix
View file

@ -1,4 +1,4 @@
{ buildPythonPackage, poetry-core, pytestCheckHook, clightning, pyln-bolt7, pyln-proto }:
{ buildPythonPackage, hatchling, pytestCheckHook, clightning, pyln-bolt7, pyln-proto }:
buildPythonPackage rec {
pname = "pyln-client";
@ -7,7 +7,7 @@ buildPythonPackage rec {
inherit (clightning) src;
nativeBuildInputs = [ poetry-core ];
nativeBuildInputs = [ hatchling ];
propagatedBuildInputs = [
pyln-bolt7
@ -16,5 +16,7 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook ];
pythonNamespaces = [ "pyln" ];
postUnpack = "sourceRoot=$sourceRoot/contrib/${pname}";
}

11
pkgs/python-packages/pyln-proto/default.nix
View file

@ -1,6 +1,6 @@
{ buildPythonPackage
, clightning
, poetry-core
, hatchling
, pytestCheckHook
, bitstring
, cryptography
@ -16,7 +16,7 @@ buildPythonPackage rec {
inherit (clightning) src;
nativeBuildInputs = [ poetry-core ];
nativeBuildInputs = [ hatchling ];
propagatedBuildInputs = [
bitstring
@ -28,10 +28,7 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook ];
postUnpack = "sourceRoot=$sourceRoot/contrib/pyln-proto";
pythonNamespaces = [ "pyln" ];
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail 'cryptography = "^42"' 'cryptography = "44.0.2"'
'';
postUnpack = "sourceRoot=$sourceRoot/contrib/pyln-proto";
}

24
test/nixos-search/flake.lock generated
View file

@ -21,11 +21,11 @@
"nixos-infra": {
"flake": false,
"locked": {
"lastModified": 1757181742,
"narHash": "sha256-vB/TAFpkO0RJ05SGyO3vSvfsbwbrWi7H/nkQzJeJqOM=",
"lastModified": 1759503106,
"narHash": "sha256-eKiDUEHAZJqPrUwM5UAJ1Wz2WbyhF7s/KmGc71QI0u4=",
"owner": "NixOS",
"repo": "infra",
"rev": "3a98710aa88e46be951f8a66dbfe6cc20ff8d80b",
"rev": "8896c2175a5bcb70539ddb8a113df013cf4cfb6e",
"type": "github"
},
"original": {
@ -43,11 +43,11 @@
"npmlock2nix": "npmlock2nix"
},
"locked": {
"lastModified": 1757533305,
"narHash": "sha256-S4vW66Ay6zsfUQ0lJEBSoes5VEuYof0ISnMwsKExdO8=",
"lastModified": 1759748199,
"narHash": "sha256-C5NLUHWQBp6HkNYo3x6LrthTRMNEzTnPAo+mWaTN7zU=",
"owner": "nixos",
"repo": "nixos-search",
"rev": "1a725cbfdd81c46731b3509f02f50e6ea4e8ada8",
"rev": "701750cafad9cef7ca5384324e936df9e365e2d5",
"type": "github"
},
"original": {
@ -58,11 +58,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1756787288,
"narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
"lastModified": 1759381078,
"narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
"rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
"type": "github"
},
"original": {
@ -89,11 +89,11 @@
"npmlock2nix": {
"flake": false,
"locked": {
"lastModified": 1673447413,
"narHash": "sha256-sJM82Sj8yfQYs9axEmGZ9Evzdv/kDcI9sddqJ45frrU=",
"lastModified": 1758100811,
"narHash": "sha256-qJc3ffjHVXUdZqytKcDK9XZ2b3BQ1RdYfZFuYgxbrn4=",
"owner": "nix-community",
"repo": "npmlock2nix",
"rev": "9197bbf397d76059a76310523d45df10d2e4ca81",
"rev": "4d9060afbaa5f57ee0b8ef11c7044ed287a7d302",
"type": "github"
},
"original": {