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
6 changes: 3 additions & 3 deletions pkgs/build-support/node/fetch-pnpm-deps/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ in
# See https://github.com/NixOS/nixpkgs/pull/350063
# See https://github.com/NixOS/nixpkgs/issues/422889
if [[ ${toString fetcherVersion} -ge 2 ]]; then
find $storePath -type f -name "*-exec" -print0 | xargs -0 chmod 555
find $storePath -type f -not -name "*-exec" -print0 | xargs -0 chmod 444
find $storePath -type d -print0 | xargs -0 chmod 555
find $storePath -type f -name "*-exec" -print0 | xargs --no-run-if-empty -0 chmod 555
find $storePath -type f -not -name "*-exec" -print0 | xargs --no-run-if-empty -0 chmod 444
find $storePath -type d -print0 | xargs --no-run-if-empty -0 chmod 555
fi

if [[ ${toString fetcherVersion} -ge 3 ]]; then
Expand Down
2 changes: 2 additions & 0 deletions pkgs/test/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ in

php = recurseIntoAttrs (callPackages ./php { });

pnpm = recurseIntoAttrs (callPackages ./pnpm { });

go = recurseIntoAttrs (callPackage ../build-support/go/tests.nix { });

lake = callPackage ../build-support/lake/test { };
Expand Down
4 changes: 4 additions & 0 deletions pkgs/test/pnpm/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{ callPackage }:
{
pnpm-empty-lockfile = callPackage ./pnpm-empty-lockfile { };
}
32 changes: 32 additions & 0 deletions pkgs/test/pnpm/pnpm-empty-lockfile/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
pkgs,
stdenv,
fetchPnpmDeps,
nodejs,
pnpm_10,
pnpmConfigHook,
}:
stdenv.mkDerivation {
name = "pnpm-empty-lockfile";

src = ./.;

nativeBuildInputs = [
pnpm_10
pnpmConfigHook
];

pnpmDeps = fetchPnpmDeps {
pname = "pnpm-empty-lockfile";
fetcherVersion = 3;
pnpm = pnpm_10;
src = ./.;
hash = "sha256-u0GOAX5B1f2ANWbOezScp/eKQRRZA/JoYfQ5zLrNip4=";
};

buildPhase = ''
runHook preBuild
touch $out
runHook postBuild
'';
}
Empty file.
6 changes: 6 additions & 0 deletions pkgs/test/pnpm/pnpm-empty-lockfile/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "pnpm-empty-lockfile",
"main": "main.mjs",
"dependencies": {
}
}
9 changes: 9 additions & 0 deletions pkgs/test/pnpm/pnpm-empty-lockfile/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading