From 1cfdb89c6d797f686c266b94686986a1c5f34e1a Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 25 Oct 2024 20:06:56 +0800 Subject: [PATCH 1/3] charge-lnd: move to by-name --- .../default.nix => by-name/ch/charge-lnd/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/blockchains/charge-lnd/default.nix => by-name/ch/charge-lnd/package.nix} (100%) diff --git a/pkgs/applications/blockchains/charge-lnd/default.nix b/pkgs/by-name/ch/charge-lnd/package.nix similarity index 100% rename from pkgs/applications/blockchains/charge-lnd/default.nix rename to pkgs/by-name/ch/charge-lnd/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb1ca051f067..debce077bea6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33907,8 +33907,6 @@ with pkgs; btcpayserver-altcoins = callPackage ../applications/blockchains/btcpayserver { altcoinSupport = true; }; - charge-lnd = callPackage ../applications/blockchains/charge-lnd { }; - cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; dcrctl = callPackage ../applications/blockchains/dcrctl { }; From 1eca0d83826132f9b35512e7a684e00791da7c5a Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 25 Oct 2024 20:07:31 +0800 Subject: [PATCH 2/3] charge-lnd: nixfmt --- pkgs/by-name/ch/charge-lnd/package.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/charge-lnd/package.nix b/pkgs/by-name/ch/charge-lnd/package.nix index 1ea8912a7535..f5d3f115f9c8 100644 --- a/pkgs/by-name/ch/charge-lnd/package.nix +++ b/pkgs/by-name/ch/charge-lnd/package.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "charge-lnd"; @@ -34,7 +38,10 @@ python3Packages.buildPythonApplication rec { description = "Simple policy-based fee manager for lightning network daemon"; homepage = "https://github.com/accumulator/charge-lnd"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ mmilata mariaa144 ]; + maintainers = with maintainers; [ + mmilata + mariaa144 + ]; mainProgram = "charge-lnd"; }; } From 6d474236813ca390343658133d366331756c1a97 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 25 Oct 2024 20:11:39 +0800 Subject: [PATCH 3/3] charge-lnd: fix build --- pkgs/by-name/ch/charge-lnd/package.nix | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ch/charge-lnd/package.nix b/pkgs/by-name/ch/charge-lnd/package.nix index f5d3f115f9c8..88817c6e4b02 100644 --- a/pkgs/by-name/ch/charge-lnd/package.nix +++ b/pkgs/by-name/ch/charge-lnd/package.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, python3Packages, + makeWrapper, }: python3Packages.buildPythonApplication rec { @@ -10,9 +11,9 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "accumulator"; - repo = pname; + repo = "charge-lnd"; rev = "refs/tags/v${version}"; - sha256 = "sha256-mNU8bhiZqvYbNUU8vJNk9WbpAVrCTi9Fy3hlIpb06ac="; + hash = "sha256-mNU8bhiZqvYbNUU8vJNk9WbpAVrCTi9Fy3hlIpb06ac="; }; propagatedBuildInputs = with python3Packages; [ @@ -25,20 +26,32 @@ python3Packages.buildPythonApplication rec { termcolor ]; + nativeBuildInputs = [ + makeWrapper + ]; + postInstall = '' install README.md -Dt $out/share/doc/charge-lnd + + wrapProgram $out/bin/charge-lnd \ + --set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION "python" ''; doInstallCheck = true; + installCheckPhase = '' $out/bin/charge-lnd --help > /dev/null ''; - meta = with lib; { + env = { + PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + }; + + meta = { description = "Simple policy-based fee manager for lightning network daemon"; homepage = "https://github.com/accumulator/charge-lnd"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ mmilata mariaa144 ];