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

spark-wallet: use nodejs 14 instead of 12 since latter is EOL

Browse Source
This commit is contained in:
Jonas Nick 2022-05-30 15:28:06 +00:00 committed by nixbitcoin
parent ebaa9a3f2e
commit 636d508b50
No known key found for this signature in database
GPG Key ID: B6044ECBA2DAE5D0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/spark-wallet/composition.nix
View File

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
let let
nodeEnv = import "${toString pkgs.path}/pkgs/development/node-packages/node-env.nix" { nodeEnv = import "${toString pkgs.path}/pkgs/development/node-packages/node-env.nix" {

5
pkgs/spark-wallet/generate.sh
View File

@ -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 jq '.dependencies["qrcode-terminal"] = .optionalDependencies["qrcode-terminal"]' $src/package.json | sponge $src/package.json
# Generate nix pkg # 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 \ node2nix \
--nodejs-12 \ --nodejs-14 \
--input $src/package.json \ --input $src/package.json \
--lock $src/npm-shrinkwrap.json \ --lock $src/npm-shrinkwrap.json \
--composition composition.nix \ --composition composition.nix \