Unverified Commit eac4e480 authored by Lily Foster's avatar Lily Foster Committed by GitHub
Browse files

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

ntfy-sh: build node dependencies with nodejs_18
parents 1d7b09e9 a05f8cfe

pkgs/tools/misc/ntfy-sh/generate-dependencies.sh

+1 −2
Original line number Diff line number Diff line
@@ -3,9 +3,8 @@ 
ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../../..)"



$(nix-build $ROOT -A  nodePackages.node2nix --no-out-link)/bin/node2nix \

  --nodejs-14 \

  --nodejs-18 \

  --node-env ../../../development/node-packages/node-env.nix \

  --development \

  --output node-packages.nix \

  --composition node-composition.nix

# removed temporarily because of https://github.com/svanderburg/node2nix/issues/312

pkgs/tools/misc/ntfy-sh/node-composition.nix

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


{pkgs ? import <nixpkgs> {

    inherit system;

  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:

  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}:



let

  nodeEnv = import ../../../development/node-packages/node-env.nix {