From 636d508b50356f0c997762fcaef084a312073f4d Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Mon, 30 May 2022 15:28:06 +0000 Subject: [PATCH] spark-wallet: use nodejs 14 instead of 12 since latter is EOL --- pkgs/spark-wallet/composition.nix | 2 +- pkgs/spark-wallet/generate.sh | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/spark-wallet/composition.nix b/pkgs/spark-wallet/composition.nix index 01c4b77..087380e 100644 --- a/pkgs/spark-wallet/composition.nix +++ b/pkgs/spark-wallet/composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import "${toString pkgs.path}/pkgs/development/node-packages/node-env.nix" { diff --git a/pkgs/spark-wallet/generate.sh b/pkgs/spark-wallet/generate.sh index 6f2aa7e..756790b 100755 --- a/pkgs/spark-wallet/generate.sh +++ b/pkgs/spark-wallet/generate.sh @@ -28,8 +28,11 @@ tar xvf $TMPDIR/$file -C $src --strip-components 1 >/dev/null jq '.dependencies["qrcode-terminal"] = .optionalDependencies["qrcode-terminal"]' $src/package.json | sponge $src/package.json # Generate nix pkg +# TODO-EXTERNAL: remove --nodejs-14 option once +# https://github.com/svanderburg/node2nix/pull/296 has made its way into a +# node2nix release. node2nix \ - --nodejs-12 \ + --nodejs-14 \ --input $src/package.json \ --lock $src/npm-shrinkwrap.json \ --composition composition.nix \