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

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

Browse Source 
a333989ca8 update nixpkgs (Jonas Nick)
313e374774 Revert "pkgs: add lnd 0.15.4 (hotfix)" (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK a333989ca8

Tree-SHA512: cf9a0c42002f00eadcb6e97211358210c6ab214f467b25af23c70477c40134b3d9a26c7ff00ec15d5a06f2a4bfe9832b11e6ae0faa136249c1180f5ae2e59734
This commit is contained in:
Jonas Nick 2022-11-10 12:56:41 +00:00
commit 81350a03c9
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
5 changed files with 44 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
flake.lock
View File

@ -10,10 +10,11 @@
]
},
"locked": {
"lastModified": 1666443795,
"lastModified": 1667229260,
"narHash": "sha256-+J7woVK3pnMwHvJSrB0kYKWqEB4yYDqBcFFg8IhIFhw=",
"owner": "erikarvstedt",
"repo": "extra-container",
"rev": "3b69ecfd363983cdee4db7f5d118b0ca099d23ed",
"rev": "3fce6c52bad520110c570c8ec5f02e2e6b93ce68",
"type": "github"
},
"original": {
@ -24,11 +25,11 @@
},
"flake-utils": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
@ -39,11 +40,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1666528161,
"narHash": "sha256-PFOQSC0x4xPD1p/GZIbpKuoEBu6M8HnEOeNRiBUCELA=",
"lastModified": 1667921968,
"narHash": "sha256-EI+//LbhUzX471LHq8GgB+oUHpdA2rsiXpY1q5tDYGw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "471d92178b978fcbad8db27c2e8a4e737d4e0e27",
"rev": "df2bcbbd1c2aa144261cf1b0003c889c075dc693",
"type": "github"
},
"original": {
@ -55,11 +56,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1666570118,
"narHash": "sha256-MTXmIYowHM1wyIYyqPdBLia5SjGnxETv0YkIbDsbkx4=",
"lastModified": 1668058645,
"narHash": "sha256-vHAXeYfKVO6ZbDN0GquEPVFZ42LzlYoX4ZWuKteFzj0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1e684b371cf05300bc2b432f958f285855bac8fb",
"rev": "d01cb18be494e3d860fcfe6be4ad63614360333c",
"type": "github"
},
"original": {

4
pkgs/default.nix
View File

@ -37,9 +37,5 @@ let self = {
pinned = import ./pinned.nix pkgs pkgsUnstable;
# TODO-EXTERNAL:
# Remove this when lnd 0.15.4 is available in the nixpkgs-unstable channel
lnd = pkgsUnstable.callPackage ./lnd-0.15.4.nix {};
modulesPkgs = self // self.pinned;
}; in self

40
pkgs/lnd-0.15.4.nix
View File

@ -1,40 +0,0 @@
{ buildGoModule
, fetchFromGitHub
, lib
, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" "monitoring" "kvdb_postgres" "kvdb_etcd" ]
}:
buildGoModule rec {
pname = "lnd";
version = "0.15.4-beta";
src = fetchFromGitHub {
owner = "lightningnetwork";
repo = "lnd";
rev = "v${version}";
sha256 = "sha256-/PKW2Y6+PlWk88pC4DHFi1ZRqMfQzoO9MVLYZrB2UNc=";
};
vendorSha256 = "sha256-bUo0PhtOFhsZfhAXtRJMjfaLrAsOv3ksxsrPOlMNv48=";
subPackages = [ "cmd/lncli" "cmd/lnd" ];
preBuild = let
buildVars = {
RawTags = lib.concatStringsSep "," tags;
GoVersion = "$(go version | egrep -o 'go[0-9]+[.][^ ]*')";
};
buildVarsFlags = lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "-X github.com/lightningnetwork/lnd/build.${k}=${v}") buildVars);
in
lib.optionalString (tags != []) ''
buildFlagsArray+=("-tags=${lib.concatStringsSep " " tags}")
buildFlagsArray+=("-ldflags=${buildVarsFlags}")
'';
meta = with lib; {
description = "Lightning Network Daemon";
homepage = "https://github.com/lightningnetwork/lnd";
license = licenses.mit;
maintainers = with maintainers; [ cypherpunk2140 prusnak ];
};
}

3
pkgs/pinned.nix
View File

@ -4,8 +4,8 @@ pkgs: pkgsUnstable:
inherit (pkgs)
bitcoin
bitcoind
extra-container
lightning-pool
lnd
lndconnect;
inherit (pkgsUnstable)
@ -14,6 +14,7 @@ pkgs: pkgsUnstable:
clightning
electrs
elementsd
extra-container
fulcrum
hwi
lightning-loop

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

@ -2,11 +2,11 @@
"nodes": {
"flake-utils": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
@ -18,11 +18,11 @@
"nixos-org-configurations": {
"flake": false,
"locked": {
"lastModified": 1660725019,
"narHash": "sha256-729dr5TzCG3JIYgrcyyZQoG/e+Ugr6r2NB08Izer0q8=",
"lastModified": 1666806338,
"narHash": "sha256-Q0uLdIJAMi1sC0bNOKoPJk39hMMkves1rtEsFDAZZ5o=",
"owner": "NixOS",
"repo": "nixos-org-configurations",
"rev": "569797100aac69780a12542c2143bb741380d4ec",
"rev": "cebfd15c30724cadacf85b5fd950dc1070c4eb7d",
"type": "github"
},
"original": {
@ -35,14 +35,15 @@
"inputs": {
"flake-utils": "flake-utils",
"nixos-org-configurations": "nixos-org-configurations",
"nixpkgs": "nixpkgs"
"nixpkgs": "nixpkgs",
"npmlock2nix": "npmlock2nix"
},
"locked": {
"lastModified": 1662653345,
"narHash": "sha256-0rNKV9TyHUJSGe9Y16ZNnFBGTUIpfqU5Oy4K6pW4dW0=",
"lastModified": 1667951037,
"narHash": "sha256-P233F+7HLoOmTQgDFXbRUvdRBGmz1TlWPBd7InNRM9g=",
"owner": "nixos",
"repo": "nixos-search",
"rev": "e7ceafb0d4fa3c570bbf06918db75760fba7f384",
"rev": "f249d4964e38b13f32e25634145e06853db41657",
"type": "github"
},
"original": {
@ -53,11 +54,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1661450036,
"narHash": "sha256-0/9UyJLtfWqF4uvOrjFIzk8ue1YYUHa6JIhV0mALkH0=",
"lastModified": 1667629849,
"narHash": "sha256-P+v+nDOFWicM4wziFK9S/ajF2lc0N2Rg9p6Y35uMoZI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f3d0897be466aa09a37f6bf59e62c360c3f9a6cc",
"rev": "3bacde6273b09a21a8ccfba15586fb165078fb62",
"type": "github"
},
"original": {
@ -66,6 +67,22 @@
"type": "indirect"
}
},
"npmlock2nix": {
"flake": false,
"locked": {
"lastModified": 1666460237,
"narHash": "sha256-HME6rnysvCwUVtH+BDWDGahmweMaLgD2wqHeRuGp6QI=",
"owner": "nix-community",
"repo": "npmlock2nix",
"rev": "eeed152290ec2425f96c5e74e469c40b621e1468",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "npmlock2nix",
"type": "github"
}
},
"root": {
"inputs": {
"nixos-search": "nixos-search"