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

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

Browse source 
ed163fece1 update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK ed163fece1

Tree-SHA512: 671d40ed9e545a8076e67c29e32f74fd071d1d0f388c57e6204120d96a8a58e92f1559ddb33620e11f1260f0843ff5ceeb49bde0cbfb966f6ecbaeabd173270f
This commit is contained in:
Jonas Nick 2025-01-21 17:50:38 +00:00
commit dc4d14e073
No known key found for this signature in database
GPG key ID: 4861DBF262123605
4 changed files with 20 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.lock generated
View file

@ -44,11 +44,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1734323986, "lastModified": 1737299813,
"narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "394571358ce82dff7411395829aa6a3aad45b907", "rev": "107d5ef05c0b1119749e381451389eded30fb0d5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,11 +60,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1734126203, "lastModified": 1737370608,
"narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=", "narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "71a6392e367b08525ee710a93af2e80083b5b3e2", "rev": "300081d0cc72df578b02d914df941b8ec62240e6",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
modules/lnd.nix
View file

@ -211,12 +211,6 @@ in {
zmqpubrawblock = mkDefault "tcp://${bitcoindRpcAddress}:28332"; zmqpubrawblock = mkDefault "tcp://${bitcoindRpcAddress}:28332";
zmqpubrawtx = mkDefault "tcp://${bitcoindRpcAddress}:28333"; zmqpubrawtx = mkDefault "tcp://${bitcoindRpcAddress}:28333";
# TODO-EXTERNAL: remove when https://github.com/lightningnetwork/lnd/issues/9163
# has been fixed.
extraConfig = ''
deprecatedrpc=warnings
'';
}; };
environment.systemPackages = [ cfg.package (hiPrio cfg.cli) ]; environment.systemPackages = [ cfg.package (hiPrio cfg.cli) ];

10
pkgs/pinned.nix
View file

@ -2,24 +2,24 @@
pkgs: pkgsUnstable: pkgs: pkgsUnstable:
{ {
inherit (pkgs) inherit (pkgs)
bitcoin
bitcoind
btcpayserver btcpayserver
charge-lnd charge-lnd
extra-container
fulcrum fulcrum
hwi hwi
lightning-loop lightning-loop
lightning-pool lightning-pool
lnd
lndconnect lndconnect
nbxplorer; nbxplorer;
inherit (pkgsUnstable) inherit (pkgsUnstable)
bitcoin
bitcoind
clboss clboss
clightning clightning
electrs electrs
elementsd; elementsd
extra-container
lnd;
inherit pkgs pkgsUnstable; inherit pkgs pkgsUnstable;
} }

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

@ -21,11 +21,11 @@
"nixos-infra": { "nixos-infra": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733506865, "lastModified": 1736003076,
"narHash": "sha256-vI4fLD2lEj09J3s/rSERNUBM0t+YjpGmmEUzhGXpngM=", "narHash": "sha256-QXdl4ZJd287CRuBYBPrSvLv/ib7L41HhHemvbNxDUqQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "infra", "repo": "infra",
"rev": "fadaefc936f321e6f18f9144a2b9a18b3c703644", "rev": "e5c6c097a0d575d16f9c407738d809af1a6cd4c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -43,11 +43,11 @@
"npmlock2nix": "npmlock2nix" "npmlock2nix": "npmlock2nix"
}, },
"locked": { "locked": {
"lastModified": 1733672217, "lastModified": 1736159204,
"narHash": "sha256-8VqXAkRpel6e50q6cetpXlSzmxgig3zf+THgMbf3Dd4=", "narHash": "sha256-YwZdrHHv6GNOWtpEp02ulBIrsrOB9dG2mc42mwxp5fk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-search", "repo": "nixos-search",
"rev": "381ffa11f1d22cc4421ff88fbb6e0d75a4e5de26", "rev": "510d42d847600c0f197a233a564b428d7551f510",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -58,11 +58,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1733392399, "lastModified": 1735834308,
"narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
"type": "github" "type": "github"
}, },
"original": { "original": {