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

Merge fort-nix/nix-bitcoin#606: Update nixpkgs

Browse Source 
9f3daab64f lnd: fix cert key format bug (Erik Arvstedt)
744d8fe379 update nixpkgs (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 9f3daab64f

Tree-SHA512: eb99133c495d9e0df6ba50efb9c693a94883467845aa30537fbb7f40c60c36acb414d1865653ad33a3a05ac2e0dbfcfdc54039754aa54e83f60b9b3f071c7640
This commit is contained in:
Jonas Nick 2023-05-07 19:42:25 +00:00
commit 30c874de01
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
5 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock
View File

@ -43,11 +43,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1681482634, "lastModified": 1683207485,
"narHash": "sha256-cT/nr3L8khEYZSGp8qqwxFH+/q4/547MfyOdSj6MhBk=", "narHash": "sha256-gs+PHt/y/XQB7S8+YyBLAM8LjgYpPZUVFQBwpFSmJro=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fda0d99c2cbbb5c89d8855d258cb0821bd9113ad", "rev": "cc45a3f8c98e1c33ca996e3504adefbf660a72d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -59,11 +59,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1681571934, "lastModified": 1683353485,
"narHash": "sha256-Q3B3HTqhTahhPCT53ahK1FPktOXlEWmudSttd9CWGbE=", "narHash": "sha256-Skp5El3egmoXPiINWjnoW0ktVfB7PR/xc4F4bhD+BJY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "29176972b4be60f7d3eb3101f696c99f2e6ada57", "rev": "caf436a52b25164b71e0d48b671127ac2e2a5b75",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
pkgs/default.nix
View File

@ -22,6 +22,11 @@ let self = {
spark-wallet = pkgs.callPackage ./spark-wallet { }; spark-wallet = pkgs.callPackage ./spark-wallet { };
trustedcoin = pkgs.callPackage ./trustedcoin { }; trustedcoin = pkgs.callPackage ./trustedcoin { };
# TODO-EXTERNAL:
# Remove this when https://github.com/lightningnetwork/lnd/pull/7672
# has been resolved
lnd = pkgsUnstable.callPackage ./lnd { };
pyPkgs = import ./python-packages self pkgs.python3; pyPkgs = import ./python-packages self pkgs.python3;
inherit (self.pyPkgs) inherit (self.pyPkgs)
nbPython3Packages nbPython3Packages

12
pkgs/lnd/default.nix Normal file
View File

@ -0,0 +1,12 @@
{ lnd, fetchpatch }:
lnd.overrideAttrs (_: {
patches = [
(fetchpatch {
# https://github.com/lightningnetwork/lnd/pull/7672
name = "fix-PKCS8-cert-key-support";
url = "https://github.com/lightningnetwork/lnd/pull/7672.patch";
hash = "sha256-j9EirxyNi48DGzLuHcZ36LrFlbJLXrE8L+1TYh5Yznk=";
})
];
})

3
pkgs/pinned.nix
View File

@ -5,7 +5,6 @@ pkgs: pkgsUnstable:
bitcoin bitcoin
bitcoind bitcoind
extra-container extra-container
lightning-loop
lightning-pool lightning-pool
lndconnect; lndconnect;
@ -17,7 +16,7 @@ pkgs: pkgsUnstable:
elementsd elementsd
fulcrum fulcrum
hwi hwi
lnd lightning-loop
nbxplorer; nbxplorer;
inherit pkgs pkgsUnstable; inherit pkgs pkgsUnstable;

6
test/nixos-search/flake.lock
View File

@ -39,11 +39,11 @@
"npmlock2nix": "npmlock2nix" "npmlock2nix": "npmlock2nix"
}, },
"locked": { "locked": {
"lastModified": 1681159207, "lastModified": 1683204679,
"narHash": "sha256-GQqLPhFm9WM2n5sQGwtjWlYe5J5uTHpsZ9rdO5q0fzM=", "narHash": "sha256-GrZj4skt6pjcNMmGQxvf5bSDYPzNahWKSNsHAtx5ERI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-search", "repo": "nixos-search",
"rev": "eb2910bffae596c379e2000efda780c0e47331b6", "rev": "0498effc4137095938f16fd752cc81a96901554f",
"type": "github" "type": "github"
}, },
"original": { "original": {