Merge pull request #236329 from kalbasit/personal/soxincfg/update-23.05/onlykey

This commit is contained in:
Wael Nasreddine 2023-06-06 23:01:53 -07:00 committed by GitHub
commit ab85158359
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 927 additions and 1195 deletions

View file

@ -2,4 +2,4 @@
#! nix-shell -i bash -p nodePackages.node2nix
# XXX: --development is given here because we need access to gulp in order to build OnlyKey.
exec node2nix --nodejs-14 --development -i package.json -c onlykey.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env
exec node2nix --nodejs-18 --development -i package.json -c onlykey.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env

File diff suppressed because it is too large Load diff

View file

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

View file

@ -1,3 +1,3 @@
[
{"onlykey": "git+https://github.com/trustcrypto/OnlyKey-App.git#v5.3.4"}
{"onlykey": "git+https://github.com/trustcrypto/OnlyKey-App.git#v5.5.0"}
]