Merge fort-nix/nix-bitcoin#793: Update nixpkgs
042f4af4faupdate nixpkgs (Erik Arvstedt) Pull request description: ACKs for top commit: jonasnick: ACK042f4af4faTree-SHA512: a46a00ad1bc04c1774818340a4528f811bbfdcdf81cb50b1a33fcfb2f6984ea395a603df3b9830e9e06f0a46813a0504af6312a504716cbfda3789b09e51804c
This commit is contained in:
commit
aec8331f26
4 changed files with 18 additions and 18 deletions
12
flake.lock
generated
12
flake.lock
generated
|
|
@ -44,11 +44,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749494155,
|
"lastModified": 1750969886,
|
||||||
"narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=",
|
"narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "88331c17ba434359491e8d5889cce872464052c2",
|
"rev": "a676066377a2fe7457369dd37c31fd2263b662f4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -60,11 +60,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749558678,
|
"lastModified": 1750994206,
|
||||||
"narHash": "sha256-DUVAe8E2X2QM0dAnTGlTiqemMqUMMyIeCH7UeNo0g64=",
|
"narHash": "sha256-3u6rEbIX9CN/5A5/mc3u0wIO1geZ0EhjvPBXmRDHqWM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a12f3a99614894502e73eb816e9e076b0ab05730",
|
"rev": "80d50fc87924c2a0d346372d242c27973cf8cdbf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
|
|
||||||
inherit (clightning) src;
|
inherit (clightning) src;
|
||||||
|
|
||||||
cargoHash = "sha256-nR4jSpjnB0k/v+E78Jy5AhOLwqJgvAfDKFca3DqaSwQ=";
|
cargoHash = "sha256-HxFfiFlILv8OOHn6Yt5cC41Gw0eya4uCAwXdK83X1bQ=";
|
||||||
|
|
||||||
depsExtraArgs = {
|
depsExtraArgs = {
|
||||||
nativeBuildInputs = [ unzip ];
|
nativeBuildInputs = [ unzip ];
|
||||||
|
|
|
||||||
|
|
@ -5,10 +5,8 @@ pkgs: pkgsUnstable:
|
||||||
bitcoin
|
bitcoin
|
||||||
bitcoind
|
bitcoind
|
||||||
bitcoind-knots
|
bitcoind-knots
|
||||||
btcpayserver
|
|
||||||
charge-lnd
|
charge-lnd
|
||||||
clboss
|
clboss
|
||||||
clightning
|
|
||||||
electrs
|
electrs
|
||||||
elementsd
|
elementsd
|
||||||
extra-container
|
extra-container
|
||||||
|
|
@ -18,6 +16,8 @@ pkgs: pkgsUnstable:
|
||||||
lndconnect;
|
lndconnect;
|
||||||
|
|
||||||
inherit (pkgsUnstable)
|
inherit (pkgsUnstable)
|
||||||
|
btcpayserver
|
||||||
|
clightning
|
||||||
lightning-loop
|
lightning-loop
|
||||||
lnd;
|
lnd;
|
||||||
|
|
||||||
|
|
|
||||||
18
test/nixos-search/flake.lock
generated
18
test/nixos-search/flake.lock
generated
|
|
@ -21,11 +21,11 @@
|
||||||
"nixos-infra": {
|
"nixos-infra": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749261912,
|
"lastModified": 1750427995,
|
||||||
"narHash": "sha256-OoCw4/iwga0OFuARK8IBHtjaA2QFo8920Vh5JfXO9z0=",
|
"narHash": "sha256-Z4wu8/XMYBgPPtuQ18uyjuBqjYkUWhqPBbhhsAH4je0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "infra",
|
"repo": "infra",
|
||||||
"rev": "7e35a0b93517123ccbbd7acf6c0467a307bf3e8b",
|
"rev": "1668c481ca6a64efd2c58555ee86f821bc6d8670",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -43,11 +43,11 @@
|
||||||
"npmlock2nix": "npmlock2nix"
|
"npmlock2nix": "npmlock2nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749599990,
|
"lastModified": 1750668605,
|
||||||
"narHash": "sha256-vqk8guF0t7akJKa2IlNYaKYmpDWyHF+Ixl/EJ8cAFF0=",
|
"narHash": "sha256-1Q3WW95IgyFLWobzR/pJCRGW911m3cZX0rbOSiwnrVw=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-search",
|
"repo": "nixos-search",
|
||||||
"rev": "e29ad815a21eae3afffeefe23c31ae5cb6b7779c",
|
"rev": "0133ed929f57696ab2011413d83223af59ab8900",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -58,11 +58,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749143949,
|
"lastModified": 1750365781,
|
||||||
"narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
|
"narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
|
"rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue