BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #230188 from arjan-s/ntfy-fix-node14

Browse source 
ntfy-sh: build node dependencies with nodejs_18
This commit is contained in:
Lily Foster 2023-05-12 13:10:06 -04:00 committed by GitHub
commit eac4e4801b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/tools/misc/ntfy-sh/generate-dependencies.sh
View file

@ -3,9 +3,8 @@
ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../../..)" ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../../..)"
$(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ $(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \
--nodejs-14 \ --nodejs-18 \
--node-env ../../../development/node-packages/node-env.nix \ --node-env ../../../development/node-packages/node-env.nix \
--development \
--output node-packages.nix \ --output node-packages.nix \
--composition node-composition.nix --composition node-composition.nix
# removed temporarily because of https://github.com/svanderburg/node2nix/issues/312 # removed temporarily because of https://github.com/svanderburg/node2nix/issues/312

2
pkgs/tools/misc/ntfy-sh/node-composition.nix
View file

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