From f4c159d0e27ed540a15d65bbee64e2adfaf818b6 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Mon, 27 Feb 2023 13:21:01 +0000 Subject: [PATCH 1/2] rtl: 0.13.4 -> 0.13.6 --- pkgs/rtl/default.nix | 6 +++--- pkgs/rtl/generate.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/rtl/default.nix b/pkgs/rtl/default.nix index fe56483..db00908 100644 --- a/pkgs/rtl/default.nix +++ b/pkgs/rtl/default.nix @@ -10,11 +10,11 @@ }: let self = stdenvNoCC.mkDerivation { pname = "rtl"; - version = "0.13.4"; + version = "0.13.6"; src = fetchurl { url = "https://github.com/Ride-The-Lightning/RTL/archive/refs/tags/v${self.version}.tar.gz"; - hash = "sha256-WVldNnmCB7Gi/U3dUDTYF58i480eXkstRnEg+1QCeMM="; + hash = "sha256-eyRM28h2TV3IyW4hDPHj/wMJxLEZin7AqWQZGQt5mV4="; }; passthru = { @@ -26,7 +26,7 @@ let self = stdenvNoCC.mkDerivation { # TODO-EXTERNAL: Remove `npmFlags` when no longer required # See: https://github.com/Ride-The-Lightning/RTL/issues/1182 npmFlags = "--legacy-peer-deps"; - hash = "sha256-AG7930RGLxbPp1ErTGuYvUvPur9ppEmg91Taz7Ube6w="; + hash = "sha256-C4yK6deYXPrTa383aXiHoO0w3JAMIfAaESCEy9KKY2k="; }; }; diff --git a/pkgs/rtl/generate.sh b/pkgs/rtl/generate.sh index 6c62b63..53b1d7e 100755 --- a/pkgs/rtl/generate.sh +++ b/pkgs/rtl/generate.sh @@ -2,7 +2,7 @@ set -euo pipefail . "${BASH_SOURCE[0]%/*}/../../helper/run-in-nix-env" "gnupg wget gnused" "$@" -version="0.13.4" +version="0.13.6" repo=https://github.com/Ride-The-Lightning/RTL scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) From 58c7e5519bfa1596bf829492aca82c5843b40f56 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Mon, 27 Feb 2023 13:21:17 +0000 Subject: [PATCH 2/2] rtl: set DB_DIRECTORY_PATH This prevents RTL from trying to create a database in the directory that contains the RTL executable. --- modules/rtl.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/rtl.nix b/modules/rtl.nix index 19bc118..aa6c5bf 100644 --- a/modules/rtl.nix +++ b/modules/rtl.nix @@ -191,6 +191,7 @@ in { optional cfg.nodes.lnd.enable "lnd.service"; after = requires; environment.RTL_CONFIG_PATH = cfg.dataDir; + environment.DB_DIRECTORY_PATH = cfg.dataDir; serviceConfig = nbLib.defaultHardening // { ExecStartPre = [ (nbLib.script "rtl-setup-config" ''