Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@ npmConfigHook() {
fi

local -r cacheLockfile="$npmDeps/package-lock.json"
local -r srcLockfile="$PWD/package-lock.json"
if [[ -f npm-shrinkwrap.json ]]; then
local -r srcLockfile="$PWD/npm-shrinkwrap.json"
else
local -r srcLockfile="$PWD/package-lock.json"
fi

echo "Validating consistency between $srcLockfile and $cacheLockfile"

Expand Down
4 changes: 0 additions & 4 deletions pkgs/by-name/ar/ares-cli/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ buildNpmPackage rec {
hash = "sha256-L8suZDtXVchVyvp7KCv0UaceJqqGBdfopd5tZzwj3MY=";
};

postPatch = ''
ln -s npm-shrinkwrap.json package-lock.json
'';

dontNpmBuild = true;
npmDepsHash = "sha256-ATIxe/sulfOpz5KiWauDAPZrlfUOFyiTa+5ECFbVd+0=";

Expand Down
3 changes: 0 additions & 3 deletions pkgs/by-name/ba/balena-cli/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ buildNpmPackage' rec {

npmDepsHash = "sha256-SWtWXvWUuIzMqLoEDRTqVJyWNK/FXOA/LF73kCWfuz4=";

postPatch = ''
ln -s npm-shrinkwrap.json package-lock.json
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this PR was completely buggy, I wonder how come balena-cli hasn't became broken. @thunze Do you have an idea?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nix-build -A balena-cli.npmDeps --check fails for me.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I see. We see this failure only now when this PR has reached master.

'';
makeCacheWritable = true;

nativeBuildInputs = [
Expand Down
4 changes: 0 additions & 4 deletions pkgs/by-name/bt/btc-rpc-explorer/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ buildNpmPackage rec {

npmDepsHash = "sha256-eYA2joO4wcV10xJeYLqCbvM2szWlqofmugoHHD9D30U=";

postPatch = ''
ln -s npm-shrinkwrap.json package-lock.json
'';

makeCacheWritable = true;

nativeBuildInputs = [
Expand Down
4 changes: 0 additions & 4 deletions pkgs/by-name/fi/firebase-tools/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ buildNpmPackage rec {

npmDepsHash = "sha256-EhUJj1kSMslCXhgzCEiVn+4DSmRfvj/nh3OmaZCh/bk=";

postPatch = ''
ln -s npm-shrinkwrap.json package-lock.json
'';

nativeBuildInputs = [
python3
]
Expand Down
4 changes: 0 additions & 4 deletions pkgs/by-name/pa/particle-cli/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ buildNpmPackage (finalAttrs: {
dontNpmBuild = true;
dontNpmPrune = true;

postPatch = ''
ln -s npm-shrinkwrap.json package-lock.json
'';

postInstall = ''
install -D -t $out/etc/udev/rules.d \
$out/lib/node_modules/particle-cli/assets/50-particle.rules
Expand Down
4 changes: 0 additions & 4 deletions pkgs/by-name/re/redoc-cli/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ buildNpmPackage rec {

npmDepsHash = "sha256-XL4D7+hb0zOxAr/aRo2UOg4UOip3oewbffsnkFddmWw=";

postPatch = ''
ln -s npm-shrinkwrap.json package-lock.json
'';

dontNpmBuild = true;

meta = {
Expand Down
4 changes: 0 additions & 4 deletions pkgs/by-name/si/sitespeed-io/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ buildNpmPackage rec {
hash = "sha256-S7XYDxKODK6R/O9kNVq04pponYfcwTwsyVQO8yh598w=";
};

postPatch = ''
ln -s npm-shrinkwrap.json package-lock.json
'';

# Don't try to download the browser drivers
CHROMEDRIVER_SKIP_DOWNLOAD = true;
GECKODRIVER_SKIP_DOWNLOAD = true;
Expand Down
4 changes: 0 additions & 4 deletions pkgs/by-name/x2/x2t/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,6 @@ let
};
sourceRoot = "${finalAttrs.src.name}/build";

postPatch = ''
cp npm-shrinkwrap.json package-lock.json
'';

npmDepsHash = "sha256-Hpf+z3RGqZ1LTdow6xP00hNmWf4xs+KnVBj4NbPW4uM=";

dontNpmBuild = true;
Expand Down
Loading