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

Merge fort-nix/nix-bitcoin#613: clightning-plugins/prometheus: fix patch not being applied

Browse Source 
1b741c7cc1 clightning-plugins/prometheus: fix patch not being applied (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 1b741c7cc1

Tree-SHA512: b746e7e7a22591c7d9cc700ff124f76058334cb1f88c4e4db6ffe13ca15cdcdb27eb48de39a26034f152bcfdd0904121199f9b5ab1d9230f74ecc0703999bb71
This commit is contained in:
Jonas Nick
2023-06-11 20:00:26 +00:00
parent e3190b244f 1b741c7cc1
commit f3d6eaa12e
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/clightning-plugins/default.nix
View File

@@ -3,14 +3,25 @@ pkgs: nbPython3Packages:
let let
inherit (pkgs) lib; inherit (pkgs) lib;
src = pkgs.fetchFromGitHub { src = pkgs.applyPatches {
owner = "lightningd"; src = pkgs.fetchFromGitHub {
repo = "plugins"; owner = "lightningd";
rev = "eee5e90df442586b7f891df4fc0c67d273534737"; repo = "plugins";
sha256 = "0ry6gxp9gqpzpdjykx0a5q53saai5jydwvcy6smsh0f5dmjl8srh"; rev = "eee5e90df442586b7f891df4fc0c67d273534737";
sha256 = "0ry6gxp9gqpzpdjykx0a5q53saai5jydwvcy6smsh0f5dmjl8srh";
};
patches = [
# https://github.com/lightningd/plugins/pull/451
(pkgs.fetchpatch {
name = "202305-prometheus-msat-purge";
url = "https://github.com/lightningd/plugins/commit/f8a27b97a1b9ded8790c1f033b1f4268c0a6e210.patch";
sha256 = "sha256-0lFMhHHIi9bUU0+xaHhpnascNlFmr51JxE6e2F0s0zc=";
})
];
}; };
version = builtins.substring 0 7 src.rev; version = builtins.substring 0 7 src.src.rev;
plugins = with nbPython3Packages; { plugins = with nbPython3Packages; {
currencyrate = { currencyrate = {
@@ -33,14 +44,6 @@ let
patchRequirements = patchRequirements =
"--replace prometheus-client==0.6.0 prometheus-client==0.15.0" "--replace prometheus-client==0.6.0 prometheus-client==0.15.0"
+ " --replace pyln-client~=0.9.3 pyln-client~=23.02"; + " --replace pyln-client~=0.9.3 pyln-client~=23.02";
patches = [
# https://github.com/lightningd/plugins/pull/451
(pkgs.fetchpatch {
name = "202305-prometheus-msat-purge";
url = "https://github.com/lightningd/plugins/commit/f8a27b97a1b9ded8790c1f033b1f4268c0a6e210.patch";
sha256 = "sha256-0lFMhHHIi9bUU0+xaHhpnascNlFmr51JxE6e2F0s0zc=";
})
];
}; };
rebalance = { rebalance = {
description = "Keeps your channels balanced"; description = "Keeps your channels balanced";
@@ -82,8 +85,6 @@ let
patchShebangs '${script}' patchShebangs '${script}'
''; '';
patches = plugin.patches or [];
passthru.path = "${drv}/${script}"; passthru.path = "${drv}/${script}";
meta = with lib; { meta = with lib; {