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

rtl, clightning-rest: update to nodejs 18

Browse Source 
16 is no longer supported by NixOS 23.05.
18 is the latest LTS version.
This commit is contained in:
Erik Arvstedt 2023-07-08 15:32:58 +02:00
parent 03fb70efa4
commit bd77b89fea
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/topics/rtl.sh
View File

@ -30,7 +30,7 @@ runuser -u "$(logname)" -- xdg-open "http://$ip:3000"
rtl_src=~/s/RTL rtl_src=~/s/RTL
git clone https://github.com/Ride-The-Lightning/RTL "$rtl_src" git clone https://github.com/Ride-The-Lightning/RTL "$rtl_src"
nix build -o /tmp/nix-bitcoin-dev/nodejs --inputs-from . nixpkgs#nodejs-16_x nix build -o /tmp/nix-bitcoin-dev/nodejs --inputs-from . nixpkgs#nodejs-18_x
# Start a shell in a sandbox # Start a shell in a sandbox
env --chdir "$rtl_src" nix-bitcoin-firejail --whitelist="$rtl_src" --whitelist=/tmp/nix-bitcoin-dev/nodejs env --chdir "$rtl_src" nix-bitcoin-firejail --whitelist="$rtl_src" --whitelist=/tmp/nix-bitcoin-dev/nodejs
PATH=/tmp/nix-bitcoin-dev/nodejs/bin:"$PATH" PATH=/tmp/nix-bitcoin-dev/nodejs/bin:"$PATH"

8
pkgs/clightning-rest/default.nix
View File

@ -1,7 +1,7 @@
{ lib { lib
, stdenvNoCC , stdenvNoCC
, nodejs-16_x , nodejs-18_x
, nodejs-slim-16_x , nodejs-slim-18_x
, fetchNodeModules , fetchNodeModules
, fetchurl , fetchurl
, makeWrapper , makeWrapper
@ -17,8 +17,8 @@ let self = stdenvNoCC.mkDerivation {
}; };
passthru = { passthru = {
nodejs = nodejs-16_x; nodejs = nodejs-18_x;
nodejsRuntime = nodejs-slim-16_x; nodejsRuntime = nodejs-slim-18_x;
nodeModules = fetchNodeModules { nodeModules = fetchNodeModules {
inherit (self) src nodejs; inherit (self) src nodejs;

8
pkgs/lib.nix
View File

@ -41,8 +41,12 @@ let self = {
RestrictAddressFamilies = self.defaultHardening.RestrictAddressFamilies + " AF_NETLINK"; RestrictAddressFamilies = self.defaultHardening.RestrictAddressFamilies + " AF_NETLINK";
}; };
# nodejs applications require memory write execute for JIT compilation nodejs = {
nodejs = { MemoryDenyWriteExecute = false; }; # Required for JIT compilation
MemoryDenyWriteExecute = false;
# Required by nodejs >= 18
SystemCallFilter = self.defaultHardening.SystemCallFilter ++ [ "@pkey" ];
};
# Allow takes precedence over Deny. # Allow takes precedence over Deny.
allowLocalIPAddresses = { allowLocalIPAddresses = {

8
pkgs/rtl/default.nix
View File

@ -1,7 +1,7 @@
{ lib { lib
, stdenvNoCC , stdenvNoCC
, nodejs-16_x , nodejs-18_x
, nodejs-slim-16_x , nodejs-slim-18_x
, fetchNodeModules , fetchNodeModules
, fetchpatch , fetchpatch
, fetchurl , fetchurl
@ -18,8 +18,8 @@ let self = stdenvNoCC.mkDerivation {
}; };
passthru = { passthru = {
nodejs = nodejs-16_x; nodejs = nodejs-18_x;
nodejsRuntime = nodejs-slim-16_x; nodejsRuntime = nodejs-slim-18_x;
nodeModules = fetchNodeModules { nodeModules = fetchNodeModules {
inherit (self) src nodejs; inherit (self) src nodejs;