nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #202912 from NixOS/backport-201731-to-release-22.11

Browse Source 
[Backport release-22.11] fetchNpmDeps: allow package-json.lock symlinks
This commit is contained in:
figsoda
2022-11-25 16:15:30 -05:00
committed by GitHub
parent f01b58bd91 1ec4725e4f
commit 61936d26b7
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/node/build-npm-package/default.nix
View File

@@ -4,7 +4,9 @@
, src ? null
, srcs ? null
, sourceRoot ? null
, prePatch ? ""
, patches ? [ ]
, postPatch ? ""
, nativeBuildInputs ? [ ]
, buildInputs ? [ ]
# The output hash of the dependencies for this project.
@@ -30,7 +32,7 @@
let
npmDeps = fetchNpmDeps {
inherit src srcs sourceRoot patches;
inherit src srcs sourceRoot prePatch patches postPatch;
name = "${name}-npm-deps";
hash = npmDepsHash;
};

2
pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh
View File

@@ -27,7 +27,7 @@ npmInstallHook() {
local -r nodeModulesPath="$packageOut/node_modules"
if [ ! -d "$nodeModulesPath" ]; then
npm prune --omit dev $npmInstallFlags "${npmInstallFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}"
npm prune --omit dev --no-save $npmInstallFlags "${npmInstallFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}"
find node_modules -maxdepth 1 -type d -empty -delete
cp -r node_modules "$nodeModulesPath"

4
pkgs/build-support/node/fetch-npm-deps/default.nix
View File

@@ -140,14 +140,14 @@
buildPhase = ''
runHook preBuild
if [[ ! -f package-lock.json ]]; then
if [[ ! -e package-lock.json ]]; then
echo
echo "ERROR: The package-lock.json file does not exist!"
echo
echo "package-lock.json is required to make sure that npmDepsHash doesn't change"
echo "when packages are updated on npm."
echo
echo "Hint: You can use the patches attribute to add a package-lock.json manually to the build."
echo "Hint: You can copy a vendored package-lock.json file via postPatch."
echo
exit 1