From 6291d4fbeae5bab39d98f82782964ef053d4cc1c Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Thu, 26 Jan 2023 19:23:09 +0100 Subject: [PATCH] rtl: 0.13.2 -> 0.13.4 --- dev/topics/rtl.sh | 3 +++ pkgs/rtl/default.nix | 9 ++++++--- pkgs/rtl/generate.sh | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dev/topics/rtl.sh b/dev/topics/rtl.sh index 515f5eb..ae68c91 100644 --- a/dev/topics/rtl.sh +++ b/dev/topics/rtl.sh @@ -37,6 +37,9 @@ PATH=/tmp/nix-bitcoin-dev/nodejs/bin:"$PATH" # Install npm ci --omit=dev --omit=optional --no-update-notifier --ignore-scripts +# If the above fails, try: (details: https://github.com/Ride-The-Lightning/RTL/issues/1182) +npm ci --omit=dev --omit=optional --no-update-notifier --ignore-scripts --legacy-peer-deps + # Run node rtl --help diff --git a/pkgs/rtl/default.nix b/pkgs/rtl/default.nix index 36e7e22..fe56483 100644 --- a/pkgs/rtl/default.nix +++ b/pkgs/rtl/default.nix @@ -10,11 +10,11 @@ }: let self = stdenvNoCC.mkDerivation { pname = "rtl"; - version = "0.13.2"; + version = "0.13.4"; src = fetchurl { url = "https://github.com/Ride-The-Lightning/RTL/archive/refs/tags/v${self.version}.tar.gz"; - hash = "sha256-7VrLxmE+xPCipx7UOG1mja2pSBrj+swk55afcvBQeDU="; + hash = "sha256-WVldNnmCB7Gi/U3dUDTYF58i480eXkstRnEg+1QCeMM="; }; passthru = { @@ -23,7 +23,10 @@ let self = stdenvNoCC.mkDerivation { nodeModules = fetchNodeModules { inherit (self) src nodejs; - hash = "sha256-ohS6gVX0M1Ir1QE9SjibbCrBpkXYIv5jV1Bkv0czRw4="; + # 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="; }; }; diff --git a/pkgs/rtl/generate.sh b/pkgs/rtl/generate.sh index 87ccb73..6c62b63 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.2" +version="0.13.4" repo=https://github.com/Ride-The-Lightning/RTL scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd)